diff options
Diffstat (limited to 'extra')
76 files changed, 4298 insertions, 7147 deletions
diff --git a/extra/google-chrome/README b/extra/google-chrome/README new file mode 100644 index 000000000..cf64c7b85 --- /dev/null +++ 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! :-) + diff --git a/extra/google-chrome/google-chrome.SlackBuild b/extra/google-chrome/google-chrome.SlackBuild new file mode 100755 index 000000000..16179d2a6 --- /dev/null +++ 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 + diff --git a/extra/google-chrome/slack-desc b/extra/google-chrome/slack-desc new file mode 100644 index 000000000..a16b21187 --- /dev/null +++ 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: diff --git a/extra/slacktrack/OVERVIEW b/extra/slacktrack/OVERVIEW deleted file mode 100644 index 5e0f5d612..000000000 --- a/extra/slacktrack/OVERVIEW +++ /dev/null @@ -1,595 +0,0 @@ -############################################################################## -# Document: OVERVIEW -# Purpose : Provide an overview of the Slackware package system incorporating -# the use of 'slacktrack' -# Please note that this is *not* a guide to the use of slacktrack; -# the man page and SlackBuild scripts in the 'examples' directory -# aim to fulfill that requirement. -# Date....: 15-May-2009 -# Author..: Stuart Winter <mozes@slackware.com> -# Homepage: http://www.slackware.com/~mozes -############################################################################## - - -CONTENTS: ---------- -1.0 Preamble -2.0 Slackware packages - 2.0.1 Format of official Slackware packages - 2.0.1.1 Package names - 2.0.1.2 Version numbers - 2.0.1.3 Architectures - 2.0.1.4 Build numbers - 2.1 An overview of the creation of official Slackware packages - 2.1.1 'Clean' and 'dirty' builds - 2.1.1.1 Clean builds - 2.1.1.2 Dirty builds - 2.1.1 SlackBuild and .build scripts - 2.1.1.2 SlackBuild scripts - 2.1.1.3 .build scripts - 2.2 slacktrack in the scheme of things - 2.2.1 Using slacktrack with official .build scripts - 2.2.2 Writing your own .build scripts for slacktrack - 2.2.2.1 Making use of slacktrack's environment variables -3.0 slacktrack in operation - 3.1 How slacktrack finds which files have been installed - 3.1.1 installwatch's author -4.0 Example scripts - 4.0.1 non-slackware example build scripts - 4.0.2 slackware example wrapper build scripts -5.0 Known problems/features of slacktrack -6.0 New features -7.0 Licence - - - -1.0 Preamble - --------- - -I used to work for a company that provided web hosting and shell accounts. -When I started there were a number of shell servers all running various -releases of RedHat Linux, in various states of repair. I managed to convince -the management to let me try Slackware on there instead because I have a much -stronger understanding of how to maintain and build server using the -Slackware distribution. This trial went well and within a few months all -servers were converted to Slackware version 8.1. - -In order to ease the speed of installation (and to prevent against -forgetting to install or configure something critical), I wrote a -set of post installation scripts that upgraded Slackware packages, -configured numerous config files and copied pre-compiled software -(such as courier IMAP) onto the new system. -For other software that I could not simply copy, I'd compile it on the -new server. - -However, it soon became clear that due to security updates and so on, -it became incredibly time consuming (not to mention seriously boring) -to compile PHP, Apache and so on on every server. - -At this point, I began to investigate how to create packages for Slackware. - - -2.0 Slackware packages - ------------------ - - The Slackware Linux distribution consists of a variety of 'packages' - that make up the distribution. - - Traditionally, all packages are in '.tgz' format (a gzipped tar archive). - Starting with Slackware v13, new compression formats are supported which - are represented by three additional file extensions: - - .tgz - Gzip - .tbz - Bzip2 - .tlz - LZMA - .txz - XZ - - In this document, we use the file extension '.t?z' to represent - one of the above file formats. - - Once you have initially installed Slackware from the installer screen, - you have the facilities to install, remove or upgrade new or existing - packages using the package management tools: - - installpkg <package.t?z> - install 'package.t?z' - - upgradepkg <package.t?z> - upgrade existing 'package' with the - new version specified at the command line. - - removepkg <package> - remove specified package - - - Whilst the Slackware package system is not especially feature rich, - Slackware's user base (including me) like it because it is simple. - If we want to write our own package utilities then we can easily do so - by examining the existing package tools and querying and amending the - package database (text files). - - 2.0.1 Format of official Slackware packages - ------------------------------------- - - In Slackware 8.1 and up, each package file is named as follows: - - packagename-version-architecture-buildnumber.t?z - - 2.0.1.1 Package names - ------------- - - The package name is either the name of the single program - or the name of a collection of utilities that fall under - a single umbrella. - For example: - autoconf-2.54-noarch-1.tgz - - That is the name of the autoconf package I have on my - Slackware 8.1 box. - 'autoconf' is the name of the the entire collection of - binaries and associated documents that are extracted from - the autoconf source distribution archive. - - However, if we consider another example: - tcpip-0.17-i386-15.tgz - - There is no single piece of software called 'tcpip'. - This package contains a number of associated utilities - written by different authors but bundled into one single - 'package'. - - 2.0.1.2 Version numbers - --------------- - - If the package is the name of a particular piece of software - such as 'autoconf' from the example above, then the version - number represents the version number that its authors distribute. - - If the package is a 'bundle' such as 'tcpip' then the version - number increases as and when you add a new piece of software to - the package, or upgrade a particular piece of major software - contained within the package. - For example, with 'tcpip' above, the 0.17 refers to the version of - Linux Netkit. However, there are other programs included within - the Slackware tcpip package that are not part of 'Linux netkit'. - - 2.0.1.3 Architectures - ------------- - - The architecture is just that -- it tells you which architecture - the package is for. - - The current values in use are: - - ----- [ Official Slackware architecures ] - - noarch - Architecture independent files such as config files - i386 - packages for the x86 (Slackware v8.1 & 9) - i486 - packages for the x86 (Slackware 9.1+) - i586 - packages for the x86 - s390 - packages for the IBM s/390 mainframe - - Note: Whilst Slackware v10 is primarily built for i486, you may - find that there are some packages whose architecture versions - are higher than i486. This is for two reasons: - - [a] There is no source for the package - it is a repackaged - binary distribution (SUN's j2sdk is an example). - - [b] The package is not required or otherwise not suitable for - earlier revisions of the architecture (this is especially - the true with ARM and SPARC). - - ----- [ Unofficial ports of Slackware ] - - arm - packages for the ARM architecture - sparc - packages for the SUN Sparc architecture - powerpc - packages for the PowerPC architecture - - 2.0.1.4 Build numbers - ------------- - - A build number suplements the version number and is changed - when the *package maintainer* makes a change to the package but - the original source code and version number remains the same. - - For example, I build a package of 'foo' version 0.14 for the - sparc. I have never built this package before, thus it becomes - foo-0.14-sparc-1.tgz - However, I realise that I haven't configured - the 'bar' parameter correctly in /etc/foo.conf. I fix it - and re-build the package. The package is now named - foo-0.14-sparc-2.tgz - - - 2.1 An overview of the creation of official Slackware packages - ----------------------------------------------------------- - - This section gives a brief introduction of the two methods of - used when building the official Slackware packages. - - - 2.1.1 'Clean' and 'dirty' builds - -------------------------- - - I am assuming the reader has some experience with Makefiles - and has compiled and installed a number of software packages. - - 2.1.1.1 Clean builds - ------------ - - I term a 'clean' package one where you can specify a variable - to the 'make install' which contains the directory you wish to install - the package in, rather than installing it properly over the root file system. - For example: - # ./configure --prefix=/usr --sysconfdir=/etc - # make - # make install DESTDIR=/tmp/package-foo - - With a 'Makefile' that honours the DESTDIR variable, this will - install the whole package into /tmp/package-foo. This directory - effectively is the 'root' directory '/' as far as the Makefile - is concerned. - - From here you can use the Slackware 'makepkg' program and build - a package. - - This is by far the safest and most preferred method by all - users that make packages. - - You will find that DESTDIR is called prefix, TOPDIR and other names; - you need to examine the Makefile scripts in order to determine whether - it contains this functionality and if it does, then discover what - the variable name is. - - 2.1.1.2 Dirty builds - ------------ - - A 'dirty' build is the name I give to source distribution archives - whose Makefile scripts do not have any provisioning to install - in an alternate directory other than root. - - For these type of builds, you will typically do: - # ./configure --prefix=/usr --sysconfdir=/etc - # make - # make install - - The package will then be installed on the root filesystem. - - So how do you know what files were installed where and - even if you did, how do you pull all these files together in order - to run makepkg over them ? - That's the purpose of slacktrack! :-) - - - 2.1.1 SlackBuild and .build scripts - ----------------------------- - - Slackware has a number of packages by a great number of authors. - Some of the packages's source Makefiles honour a DESTDIR type - variable but others do not. - - 2.1.1.2 SlackBuild scripts - ------------------ - - SlackBuild scripts can be 'interesting'. They are - scripts that install into a 'clean' environment (usually /tmp). - - Some of the scripts follow the make install DESTDIR= - style, if the Makefile permits. - - Others have a 'framework' or 'controller tarball' which is - a _packagename.t?z (note the prefixing underscore). - - The SlackBuild script uses the Slackware 'explodepkg' script - to untar the contents of the _.t?z into the /tmp-package<name> - directory. - Slackbuild then runs 'make' to compile the binaries - and libraries, but then uses the 'cat' program such as: - # cat foobar > /tmp/package-foobar/usr/bin/foobar - - By using 'cat', the *new* version of 'foobar' retains - the original permissions and ownerships that are in the - controller tar ball. - - However, you may be wondering how, if the package does not - have a facility to install into somewhere other than root, - do we get the file names and permissions for the - controller _.t?z in the first place. - The answer is simple: - [a] find all files on the file system and dump to a file. - [b] compile and install the software - [c] find all files on the file system and compare the file - produced by the first 'find'. After a little pruning, you - have the list of files for the controller tar ball. - - - 2.1.1.3 .build scripts - --------------- - - For those software distributions whose Makefile does not hounour - the DESTDIR type system, there are Slackware's .build scripts. - - These scripts literally ./configure ; make ; make install - and copy docs and other goodies into the root file system. - - One of the problems with these scripts is that they are - often incomplete -- they build and install the package but - do not gzip the man pages or strip the binaries and libraries; - this is done manually afterwards. - - *These* are the scripts that slacktrack and altertrack were - written for. - - * Note: Whilst some software's Makefiles may appear to honour - the DESTDIR variable, the Makefile *may* be broken which can - result in files missing or corrupt within your new package. - For example: I built Apache v2.0.48 and built a package using - make install DESTDIR. However, a problem exists in that some of - the Perl scripts it installs have *temporary build paths* - hard coded into the resulting scripts. - This is why you *may* find a .build instead of a SlackBuild - script within Slackware's source tree. - - However, the primary reason is because the build script just - hasn't been updated to make use of DESTDIR. * - - - 2.2 slacktrack in the scheme of things - ---------------------------------- - - I follow Slackware-current quite closly. Often I want to - 'back port' a -current package to an earlier release of Slackware . - I can't simply upgrade with -current's package because it was - compiled for a newer GLIBC than Slackware 8.1's, for example. - For packages that use a 'clean' 'SlackBuild' script, this is - an easy job -- I simply run 'SlackBuild' on an 8.1 box. - - However, for .build scripts, I needed a way of building packages - using Slackware's .build scripts. - - I found a great program called 'CheckInstall' which fulfilled most of my - requirements. However, as time went on and I started building - more of Slackware's packages and writing my own build scripts, I found - that checkinstall was lacking some features that I required. - At this time I was also considering porting Slackware to run on - the ARM architecture and helping with the Splack (Slackware on SPARC project), - and therefore wanted a robust program that can deal with every .build script - I threw at it, and if it can't handle it, I needed to be able to make modifications. - The easiest way of doing this was to write my own script; thus - 'slacktrack' was born. - - slacktrack is based on the *idea* behind 'CheckInstall', but uses - only my own code (and contributions from other users), and only contains - Slackware-specific facilities -- it can not build Debian or RedHat packages - and never will. - - slacktrack does not have all of the facilities of CheckInstall either, - but then these are not required for building Slackware packages - from .build scripts. - - Also, slacktrack only works with 'official' Slackware directory locations - and /usr/local. - For example, if your make install installs binaries in /opt/packagename/bin - and the man pages in anywhere other than /usr/man or /usr/local/man, then - slacktrack's relevant options (eg stripping libs, bins, gzman) will - not detect them. - - - 2.2.1 Using slacktrack with official .build scripts - --------------------------------------------- - - Building a replicar Slackware package from a .build script is - typically fairly trivial with slacktrack. - - If we wanted to build slackware-9.1's elvis, we could do - # cd slackware/slackware-9.1/source/a/elvis - # chmod 755 elvis.build - # slacktrack -jefkzp "elvis-2.1-i386-2.tgz" ./elvis.build - - The resulting package (by default) be stored in - /tmp/built-slackwarepackages/ - - As already mentioned, some of the Slackware .build scripts - are incomplete with regard to gzipping man pages, stripping binaries - and so on -- fetchmail.build is one of them. - Therefore you can specify various options to slacktrack that - will take care of this for you. - The options in the example above : - j - compress libraries - e - chown root:bin /bin,/sbin,/usr/bin,/usr/sbin directories - f - chown root:bin files in the binary dirs listed above - k - strip binaries found in the binary dirs listed above - z - gzip man pages - p - the resulting Slackware package .t?z name - - The way I re-create the packages is to build a 'trackbuild' script that - launches slacktrack with the required options and the name - of the Slackware .build script. You can find examples of such - scripts within the docs directory after installing slacktrack: - - /usr/doc/slacktrack*/buildscript-examples/ - - You will also find that in Slackware versions 12.0 and upwards, - the .build scripts are accompanied by 'trackbuild' scripts because - slacktrack is used by the Slackware team to produce the packages. - - 2.2.2 Writing your own .build scripts for slacktrack - ---------------------------------------------- - - There isn't any specific that you have to do to write a build - script for use with slacktrack -- the script name specified to - slacktrack doesn't even have to be a script - it can be a binary - - as long as it is executable, it is acceptable. - - You can see some of my own build scripts that I have written - for use with slacktrack by looking in the documents directory - after installing slacktrack: - - /usr/doc/slacktrack*/buildscript-examples/ - - 2.2.2.1 Making use of slacktrack's environment variables - ------------------------------------------------- - - slacktrack exports two environment variables: - SLACKTRACKFAKEROOT and SLACKTRACKSCRATCHDIR - - SLACKTRACKFAKEROOT: - ```````````````````` - - The purpose of this to allow your .build script to access the - 'root' directory of the resulting package. - There are two scenarios where you may want to use this - variable: - - 1. During the build: - - The reason you may wish to do this is to pre-populate - the package with files that you may not wish to place directly - onto the root filesystem. - The package contents will only appear inside this directory - once your build script has finished, and slacktrack has determined - what to put into this directory. - - In previous slacktrack versions which used a pseudo-root filesystem - (where the package contents were populated *during* the build), this - made sense, but in slacktrack v2.00, it is unlikely that you'd want - to use this vairable from the build script. - - 2. Post-build -- cleanups after the build: - - The most likely use of this script is to perform package cleanup - tasks after the build. This is mainly to perform tasks that slacktrack - does not handle itself - such as deleting known files/directories that - creep into packages (due to a system daemon such as CUPS), or setting - some file and directory permissions. - - An example post build script is below. - A post build script can be specified by slacktrack's -R option: - - # Incase you had CUPS running: - rm -rf etc/cups etc/printcap - # crond: - rm -rf var/spool/cron - rmdir var/spool - - # perllocal.pod files don't belong in packages. - # SGMLSPL creates this: - find . -name perllocal.pod -print0 | xargs -0 rm -f - - # Some doc dirs have attracted setuid. - # We don't need setuid for anything in this package: - chmod -R a-s . - - - SLACKTRACKSCRATCHDIR: - ````````````````````` - - The purpose of this variable is to provide some temporary - space to untar your source archives and so on. slacktrack - will manage the creation and deletion of this directory. - - For example: - # cd ${SLACKTRACKSCRATCHDIR} - # tar zxvvf ${ORIGPATH}/source/foobar.tar.gz - - You can see in some of the example 'non-slackware' scripts - how I have used these variables - - -3.0 slacktrack in operation - ----------------------- - - The basic event flow is as follows: - - [1] Parse command line arguments - -> Check they are OK, if not bomb out - [2] Launch the supplied build script - [3] Run any specified functions (eg gzman, strip bins, chowns) over the - package 'root' directory and contents - [4] Run Slackware's 'makepkg' program over the package contents - [5] Move the .t?z to the specified build store path - [6] Scan for any hard links that may be in the package - -> If any found, alert the user on screen and also - log to a packagename.hardlinks.log file in the build store path - - The slacktrack shell script is fairly simple and well commented; it should be - relatively easy for anybody who understands bash to quickly comprehend what - is happening and why. - - 3.1 How slacktrack finds which files have been installed - ---------------------------------------------------- - - In order to track the files and directories that have been installed - or changed, slacktrack follows this ordered process: - - [1] Scans a pre-set list of directories on the filesystem and - logs the contents. - [2] Launches build script which installs the package onto the - filesystem - [3] Scans the filesystem once again - [4] Compares the differences in the before and after snapshots - [5] Copies the differences into a 'package root directory' and - runs makepkg over them. - - In slacktrack version 1, we used 'installwatch' which overloaded - some of glibc's filesystem calls, creating new files and directories - into a pseudo-root filesystem, avoiding the need to install onto - the host's filesystem (and also allowing to build as a non-root user). - However, this library is ill maintained and even in the early days - when it worked well, it still had problems and workarounds were required. - -4.0 Example scripts - --------------- - - Included with the slacktrack binary distribution are a number of example - scripts that hopefully should provide you with a basis of how to use slacktrack - to build from 'dirty' source distributions. - - The examples are bundled in the documentation directory available - after installing slacktrack: - - /usr/doc/slacktrack*/buildscript-examples/ - - -5.0 Known problems/features of slacktrack - ------------------------------------- - - Current problems: - - [1] slacktrack doesn't have sufficient error checking. - - I'm in two minds about *where* to put error checking, you see. - Do I go no further if the supplied build script exits with a non-zero - value? - No, that's a bad idea because what if you didn't write the build script? - it might be one of these qmail type binary installer programs that - you can't (easily without hacking the source) fix. The author may - have their own systems, and the program exits with a value that their - own controller script recognises as non-failure. - - What should I do if makepkg has failed? You see it on screen - and in the logs anyway, plus makepkg is one of the last things - that slacktrack calls -- how can you recover? - - That said, version 1.03 now has some error handling. There's still - not enough though, imo. - - [2] No support for a default config file - - I don't see the point. Each .build script is different - and although I typically use the same options to slacktrack - for most of my build scripts, I don't see why I'd need a - config file just to save 4 bytes or so in a trackbuild wrapper :-) - - -6.0 New features - ------------- - - See the TODO file in the docs directory. - - If you have any specific features you would like to see - included, or have found any bugs, please - email me <mozes@slackware.com> - -7.0 Licence - ------- - - slacktrack is distributed under BSD Licence. diff --git a/extra/source/GConf/GConf.SlackBuild b/extra/source/GConf/GConf.SlackBuild new file mode 100755 index 000000000..f6e0627c8 --- /dev/null +++ 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 + diff --git a/extra/source/GConf/GConf.url b/extra/source/GConf/GConf.url new file mode 100644 index 000000000..3fa6c986f --- /dev/null +++ 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 diff --git a/extra/source/GConf/doinst.sh b/extra/source/GConf/doinst.sh new file mode 100644 index 000000000..e4c115f3a --- /dev/null +++ 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 + diff --git a/extra/source/GConf/slack-desc b/extra/source/GConf/slack-desc new file mode 100644 index 000000000..1c6ce492d --- /dev/null +++ b/extra/source/GConf/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-------------------------------------------------------| +GConf: GConf (GNOME configuration library) +GConf: +GConf: GConf is a configuration database system, functionally similar to the +GConf: Windows registry. +GConf: +GConf: +GConf: +GConf: +GConf: Homepage: http://www.gnome.org/projects/gconf/ +GConf: +GConf: diff --git a/extra/source/ORBit2/ORBit2.SlackBuild b/extra/source/ORBit2/ORBit2.SlackBuild new file mode 100755 index 000000000..36ef40cc5 --- /dev/null +++ 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 + diff --git a/extra/source/ORBit2/ORBit2.url b/extra/source/ORBit2/ORBit2.url new file mode 100644 index 000000000..d51f9f0ac --- /dev/null +++ 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 diff --git a/extra/source/ORBit2/slack-desc b/extra/source/ORBit2/slack-desc new file mode 100644 index 000000000..867444e82 --- /dev/null +++ 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: diff --git a/extra/source/bash-completion/bash-completion-1.1-pkgtools_tgxz.diff b/extra/source/bash-completion/bash-completion-1.1-pkgtools_tgxz.diff deleted file mode 100644 index 803f59918..000000000 --- a/extra/source/bash-completion/bash-completion-1.1-pkgtools_tgxz.diff +++ /dev/null @@ -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 diff --git a/extra/source/bash-completion/bash-completion.SlackBuild b/extra/source/bash-completion/bash-completion.SlackBuild index 3fb915c02..d2e59446b 100755 --- 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,26 +43,35 @@ 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 -zcat $CWD/bash-completion-1.1-pkgtools_tgxz.diff.gz | patch -p1 || exit 1 +# Fixup sh completion for us +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 - + 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 diff --git a/extra/source/bash-completion/bash_completion.sh b/extra/source/bash-completion/bash_completion.sh index 4f2cdf824..cb2adb673 100644 --- 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 [ "$PS1" ] && [ $bmajor -eq 2 ] && [ $bminor '>' 04 ] \ - && [ -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 +if [ "$(basename $SHELL)" = "bash" -a -f /etc/bash_completion ]; then + . /etc/bash_completion fi -unset bash bmajor bminor diff --git a/extra/source/bash-completion/contrib/pkgtools b/extra/source/bash-completion/contrib/pkgtools new file mode 100644 index 000000000..2b438efca --- /dev/null +++ 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 + +} diff --git a/extra/source/bash-completion/contrib/rpm2tgz b/extra/source/bash-completion/contrib/rpm2tgz new file mode 100644 index 000000000..23c70ac9f --- /dev/null +++ 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 diff --git a/extra/source/bash-completion/contrib/sbopkg b/extra/source/bash-completion/contrib/sbopkg new file mode 100644 index 000000000..698fdf18d --- /dev/null +++ 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 diff --git a/extra/source/bash-completion/contrib/slackpkg b/extra/source/bash-completion/contrib/slackpkg new file mode 100644 index 000000000..139e7edd7 --- /dev/null +++ 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 diff --git a/extra/source/bash-completion/contrib/slapt b/extra/source/bash-completion/contrib/slapt new file mode 100644 index 000000000..779465388 --- /dev/null +++ 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 diff --git a/extra/source/bash-completion/fixup-sh-script-completions.diff b/extra/source/bash-completion/fixup-sh-script-completions.diff new file mode 100644 index 000000000..15bcf1d1c --- /dev/null +++ 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 + diff --git a/extra/source/emacspeak/emacspeak-32.0.tcl8.5.diff b/extra/source/emacspeak/emacspeak-32.0.tcl8.5.diff deleted file mode 100644 index 414018925..000000000 --- a/extra/source/emacspeak/emacspeak-32.0.tcl8.5.diff +++ /dev/null @@ -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 diff --git a/extra/source/emacspeak/emacspeak.SlackBuild b/extra/source/emacspeak/emacspeak.SlackBuild index 3235c94c5..f6d047731 100755 --- 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 diff --git a/extra/source/emacspeak/emacspeak.tcl8.5.diff b/extra/source/emacspeak/emacspeak.tcl8.5.diff new file mode 100644 index 000000000..41a003e23 --- /dev/null +++ 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) diff --git a/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild b/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild index 24ce32a5d..e61ce9174 100755 --- 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} -ARCH=${ARCH:-x86_64} +SRCVER=${SRCVER:-10_2} +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" -SRCURL="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${VERSION}.linux-${ARCH}.so.tar.gz" +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 + +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 - if ! file libflashplayer.so | grep -q "ELF 64-bit" ; then - echo "The downloaded plugin is not for the '$ARCH' architecture!"; exit 1 - fi -elif [[ "$ARCH" =~ "i?86" ]]; then - if ! file libflashplayer.so | grep -q "ELF 32-bit" ; then - echo "The downloaded plugin is not for the '$ARCH' architecture!"; exit 1 - fi -fi +case "$ARCH" in + x86_64) + if ! file libflashplayer.so | grep -q "ELF 64-bit" ; then + echo "The downloaded plugin is not for the '$ARCH' architecture!"; exit 1 + fi + ;; + i?86) + if ! file libflashplayer.so | grep -q "ELF 32-bit" ; then + 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 diff --git a/extra/source/fvwm-2.6.1/doinst.sh b/extra/source/fvwm-2.6.1/doinst.sh new file mode 100644 index 000000000..087da9e3e --- /dev/null +++ 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 diff --git a/extra/source/fvwm-2.6.1/fvwm.SlackBuild b/extra/source/fvwm-2.6.1/fvwm.SlackBuild new file mode 100755 index 000000000..e7aa4fa67 --- /dev/null +++ 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 + diff --git a/extra/source/kde3-compat/arts/slack-desc b/extra/source/fvwm-2.6.1/slack-desc index c7b45613d..2d2a9ef5f 100644 --- a/extra/source/kde3-compat/arts/slack-desc +++ b/extra/source/fvwm-2.6.1/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -arts: arts (Analog Realtime Synthesizer) -arts: -arts: aRts is the core sound system for KDE, and is short for "analog -arts: realtime synthesizer". aRts is designed to create or process sound -arts: using small specialized modules. These may create a waveform, play -arts: samples, filter data, add signals, perform effects (like delay, -arts: flanger or chorus), or output the data to the soundcard. -arts: -arts: -arts: -arts: +fvwm: fvwm (a small and fast virtual window manager for X) +fvwm: +fvwm: Fvwm is the classic highly-configurable virtual window manager for +fvwm: X11. It is a derivative of twm, redesigned to minimize memory +fvwm: consumption, provide a 3-D look to window frames, and provide a simple +fvwm: virtual desktop. +fvwm: +fvwm: Homepage: http://www.fvwm.org +fvwm: +fvwm: +fvwm: diff --git a/extra/source/fvwm-2.6.1/xinitrc.fvwm2 b/extra/source/fvwm-2.6.1/xinitrc.fvwm2 new file mode 100644 index 000000000..788a4e43a --- /dev/null +++ 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 + diff --git a/extra/source/jdk-6/COPYRIGHT b/extra/source/jdk-6/COPYRIGHT index ee5019b5c..fcb673091 100644 --- 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, -California 95054, U.S.A. All rights reserved. +Copyright © 2006, 2011, Oracle and/or its affiliates. +All rights reserved. -Sun Microsystems, Inc. has intellectual property rights relating to -technology embodied in the product that is described in this document. -In particular, and without limitation, these intellectual property -rights may include one or more of the U.S. patents listed at -http://www.sun.com/patents and one or more additional patents or pending -patent applications in the U.S. and in other countries. +This software and related documentation are provided under a +license agreement containing restrictions on use and +disclosure and are protected by intellectual property laws. +Except as expressly permitted in your license agreement or +allowed by law, you may not use, copy, reproduce, translate, +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 -MICROSYSTEMS, INC. USE, DISCLOSURE OR REPRODUCTION IS PROHIBITED -WITHOUT THE PRIOR EXPRESS WRITTEN PERMISSION OF SUN MICROSYSTEMS, INC. +The information contained herein is subject to change +without notice and is not warranted to be error-free. If +you find any errors, please report them to us in writing. -U.S. Government Rights - Commercial software. Government users are -subject to the Sun Microsystems, Inc. standard license agreement and -applicable provisions of the FAR and its supplements. +If this is software or related software documentation that +is delivered to the U.S. Government or anyone licensing it +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 -registered trademarks of Sun Microsystems, Inc. in the U.S. and other -countries. +Oracle and Java are registered trademarks of Oracle and/or +its affiliates. Other names may be trademarks of their +respective owners. -This product is covered and controlled by U.S. Export Control laws and -may be subject to the export or import laws in other countries. -Nuclear, missile, chemical biological weapons or nuclear maritime end -uses or end users, whether direct or indirect, are strictly prohibited. -Export or reexport to countries subject to U.S. embargo or to entities -identified on U.S. export exclusion lists, including, but not limited -to, the denied persons and specially designated nationals lists is -strictly prohibited. +AMD, Opteron, the AMD logo, and the AMD Opteron logo are +trademarks or registered trademarks of Advanced Micro +Devices. Intel and Intel Xeon are trademarks or registered +trademarks of Intel Corporation. All SPARC trademarks are +used under license and are trademarks or registered +trademarks of SPARC International, Inc. UNIX is a +registered trademark licensed through X/Open Company, Ltd. -Copyright © 2010 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -California 95054, Etats-Unis. Tous droits rservs. - -Sun Microsystems, Inc. dtient les droits de proprit intellectuele -relatifs la technologie incorpore dans le produit qui est dcrit dans ce -document. En particulier, et ce sans limitation, ces droits de proprit -intellectuelle peuvent inclure un ou plusieurs des brevets amricains -lists l'adresse suivante: http://www.sun.com/patents et un ou -plusieures de brevet en attente aux Etats - Unis et dans les autres -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. +This software or hardware and documentation may provide +access to or information on content, products, and services +from third parties. Oracle Corporation and its affiliates +are not responsible for and expressly disclaim all +warranties of any kind with respect to third-party content, +products, and services. Oracle Corporation and its +affiliates will not be responsible for any loss, costs, or +damages incurred due to your access to or use of third-party +content, products, or services. diff --git a/extra/source/jdk-6/HOWTO-BUILD-TXZ b/extra/source/jdk-6/HOWTO-BUILD-TXZ index 18f07e937..90a572b57 100644 --- 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 - java.sun.com and put it in the directory. +1. Download the file jdk-6u*-linux-i586.bin from + java.com and put it in the directory. 2. Run jdk.SlackBuild to package it as an installable .txz package. diff --git a/extra/source/jdk-6/LICENSE b/extra/source/jdk-6/LICENSE index 0e8bde048..39e216aa1 100644 --- a/extra/source/jdk-6/LICENSE +++ b/extra/source/jdk-6/LICENSE @@ -1,345 +1 @@ -Sun Microsystems, Inc. Binary Code License Agreement - -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. - +Please refer to http://java.com/license diff --git a/extra/source/jdk-6/README.html b/extra/source/jdk-6/README.html index 5b784f959..b7996aec4 100644 --- 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"> - <meta name="collection" content="reference"> - - <title>README -- Java Platform, Standard Edition Development Kit</title> +<title>README +</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>Contents</h2> - - <ul> - <li><a href="#introduction">Introduction</a></li> - - <li><a href="#install">System Requirements & 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 & - 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 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_<version> directory, where - <version> 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><java-home>/lib/security/local_policy.jar</code><br> - <code><java-home>/lib/security/US_export_policy.jar</code><br> - <br> - where <code><java-home></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><java-home>/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 & 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 © 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> +Please refer to http://java.com/licensereadme </body> </html> diff --git a/extra/source/jdk-6/README_ja.html b/extra/source/jdk-6/README_ja.html deleted file mode 100644 index 363acb05d..000000000 --- a/extra/source/jdk-6/README_ja.html +++ /dev/null @@ -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 ¥³¥¢ 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_<version> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£<version> ¤Ï¡¢¥¢¥Ã¥×¥Ç¡¼¥È¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤Ç¤¹¡£ 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><java-home>/lib/security/local_policy.jar</code><br> <code><java-home>/lib/security/US_export_policy.jar</code><br> <br><code><java-home></code> ¤Ï¡¢JDK ¤Î <code>jre</code> ¥Ç¥£¥ì¥¯¥È¥ê¤Þ¤¿¤Ï JRE ¤ÎºÇ¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹¡£ </blockquote> - - <blockquote> -µ¬À©¤ò¼õ¤±¤Ê¤¤¹ñ¤Î¥æ¡¼¥¶¡¼¤Î¤¿¤á¤Ë¡¢°Å¹æ²½¶¯ÅÙ¤ËÀ©¸Â¤Î¤Ê¤¤ÌµÀ©¸Â¶¯Å٥С¼¥¸¥ç¥ó¤Î¥Õ¥¡¥¤¥ë¤¬ JDK Web ¥µ¥¤¥È¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤é¤Î¹ñ¤Î¥æ¡¼¥¶¡¼¤Ï¡¢ÌµÀ©¸Â¶¯Å٥С¼¥¸¥ç¥ó¤ò¥À¥¦¥ó¥í¡¼¥É¤·¡¢¶¯ÎϰŹ沽 jar ¥Õ¥¡¥¤¥ë¤ò̵À©¸Â¶¯ÅÙ¥Õ¥¡¥¤¥ë¤ÇÃÖ¤´¹¤¨¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ - </blockquote> - -<h3>cacerts ¾ÚÌÀ½ñ¥Õ¥¡¥¤¥ë</h3> - - <blockquote> -°Ê²¼¤Ë¤¢¤ë Java SE ¾ÚÌÀ½ñ¥Õ¥¡¥¤¥ë¤Ç¥ë¡¼¥Èǧ¾Ú¶É¾ÚÌÀ½ñ¤òÄɲäޤ¿¤Ïºï½ü¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ - </blockquote> - - <blockquote> -<code><java-home>/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 © 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> - diff --git a/extra/source/jdk-6/README_zh_CN.html b/extra/source/jdk-6/README_zh_CN.html deleted file mode 100644 index a09bf21b0..000000000 --- a/extra/source/jdk-6/README_zh_CN.html +++ /dev/null @@ -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> ƽ̨ÉÏÔËÐеijÌÐò¡£ - </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> ƽ̨±àдµÄ³ÌÐò¡£¾¡¹Ü±ØÈ»»áÓÐijЩ²»¼æÈݵĸü¸Ä£¬µ«´ó²¿·ÖÈí¼þ¶¼Äܹ»ÔÚ²»ÖØбà³ÌµÄÇé¿öÏÂǨÒƵ½µ±Ç°°æ±¾¡£³ýÁËÔÚ¼«ÉÙÊýÇé¿öÏÂÓÐÒâ²»±£³Ö¼æÈÝ£¨ÈçÎÒÃǵļæÈÝÐÔ 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.* ºÍijЩ 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>) ÊÇÒ»¿î¿Éµ¥¶ÀÏÂÔصIJúÆ·¡£Çë²Î¼û<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> -±ØÐë×ñÊØÈí¼þÐí¿ÉÐÒéµÄÌõ¿îºÍÌõ¼þÒÔ¼°ÏÂÃæÌá³öµÄÒåÎñ¡¢ÏÞÖƺÍÀýÍâ¡£ÔÚÏÂÁÐÇé¿öÏ£¬Äú¿ÉÒÔ¸´Öƺͷַ¢±¾Èí¼þ£¨ÒÔ¼°ÔÚÏÂÃæ±êʶΪ“¿ÉÔÙ·Ö·¢”µÄÈí¼þ²¿·Ö£©£º - </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> -´Ë´¦Ê¹Óõē¹©Ó¦É̔һ´ÊÊÇÖ¸Ðí¿ÉÖ¤³ÖÓÐÈË¡¢¿ª·¢ÕßÒÔ¼°½« 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_<°æ±¾> Ŀ¼ÖУ¬ÆäÖÐ <°æ±¾> ÊÇ×îеİ汾ºÅ¡£½«ÏÔʾ Solaris<sup><font size="-2">TM</font></sup> ºÍ Linux µÄÎļþÃûºÍ·Ö¸ô·û¡£Windows ¿ÉÖ´ÐÐÎļþ¾ßÓÐ ".exe" ºó׺¡£»¹¿ÉÒÔÅųýÃû³ÆÖдøÓÐ <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 »Ø·Å£¬ÉùÒô¿âÎļþÊDZØÐèµÄ£¬Òò´ËÔÚÔÙ·Ö·¢ 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> -ÓÉÓÚijЩ¹ú¼Ò/µØÇø´æÔÚ½ø¿Ú¿ØÖÆÏÞÖÆ£¬Òò´Ë JDK ºÍ JRE Ë渽µÄ Java ¼ÓÃÜ·¨À©Õ¹ (JCE) ²ßÂÔÎļþÔÊÐíʹÓÃÇ¿´óµ«ÓÐÏ޵ļÓÃÜ·¨¡£ÕâЩÎļþλÓÚ<br> <br> <code><java-home>/lib/security/local_policy.jar</code><br> <code><java-home>/lib/security/US_export_policy.jar</code><br> <br>ÆäÖÐ <code><java-home></code> ÊÇ JDK µÄ <code>jre</code> Ŀ¼»ò JRE µÄ¶¥²ãĿ¼¡£ - </blockquote> - - <blockquote> -¶ÔÓÚÄÇЩλÓÚ·ûºÏÌõ¼þµÄ¹ú¼Ò/µØÇøµÄÓû§£¬¿ÉÒÔ´Ó JDK Web Õ¾µã»ñÈ¡²»¶Ô¼ÓÃܼ¼ÊõµÄÇ¿¶ÈÖ¸¶¨ÈκÎÏÞÖƵÄÎÞÏÞ¼ÓÇ¿°æÎļþ¡£Î»ÓÚ·ûºÏÌõ¼þµÄ¹ú¼Ò/µØÇøµÄÓû§¿ÉÒÔÏÂÔØÎÞÏÞ¼ÓÇ¿°æÎļþ£¬²¢ÓÃÕâЩÎļþÌ滻ǿ¶ÈÓÐÏÞµÄ jar Îļþ¡£ - </blockquote> - -<h3>Cacerts Ö¤ÊéÎļþ</h3> - - <blockquote> -¿ÉÒÔÔÚλÓÚÒÔÏÂλÖÃµÄ Java SE Ö¤ÊéÎļþÖÐÌí¼Ó»òɾ³ý¸ù CA Ö¤Êé - </blockquote> - - <blockquote> -<code><java-home>/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> diff --git a/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt b/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt index a84b0734c..4381e7dfb 100644 --- a/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt +++ b/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt @@ -1,3482 +1 @@ -DO NOT TRANSLATE OR LOCALIZE. - -%% The following software may be included in this product: CS CodeViewer v1.0; -Use of any of this software is governed by the terms of the license below: -Copyright 1999 by CoolServlets.com. - -Any errors or suggested improvements to this class can be reported as instructed -on CoolServlets.com. We hope you enjoy this program... your comments will -encourage further development! This software is distributed under the terms of -the BSD License. Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the following conditions are -met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. Neither name of -CoolServlets.com nor the names of its contributors may be used to endorse or -promote products derived from this software without specific prior written -permission. - -THIS SOFTWARE IS PROVIDED BY COOLSERVLETS.COM AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 INANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - -%% The following software may be included in this product: Crimson v1.1.1 ; Use -of any of this software is governed by the terms of the license below: - -/* -* The Apache Software License, Version 1.1 -* -* -* Copyright (c) 1999-2000 The Apache Software Foundation. All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* -* 1. Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* -* 2. Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in -* the documentation and/or other materials provided with the -* distribution. -* -* 3. The end-user documentation included with the redistribution, -* if any, must include the following acknowledgment: -* "This product includes software developed by the -* Apache Software Foundation (http://www.apache.org/)." -* Alternately, this acknowledgment may appear in the software itself, -* if and wherever such third-party acknowledgments normally appear. -* -* 4. The names "Crimson" and "Apache Software Foundation" must -* not be used to endorse or promote products derived from this -* software without prior written permission. For written -* permission, please contact apache@apache.org. -* -* 5. Products derived from this software may not be called "Apache", -* nor may "Apache" appear in their name, without prior written -* permission of the Apache Software Foundation. -* -* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR -* ITS CONTRIBUTORS 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 software consists of voluntary contributions made by many -* individuals on behalf of the Apache Software Foundation and was -* originally based on software copyright (c) 1999, International -* Business Machines, Inc., http://www.ibm.com. For more -* information on the Apache Software Foundation, please see -* <http://www.apache.org/>. -*/ - - -%% The following software may be included in this product: Xalan J2; Use of any of this -software is governed by the terms of the license below: - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document. "Licensor" -shall mean the copyright owner or entity authorized by the copyright owner that -is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities -that control, are controlled by, or are under common control with that entity. -For the purposes of this definition, "control" means (i) the power, direct or -indirect, to cause the direction or management of such entity, whether by -contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. "You" (or -"Your") shall mean an individual or Legal Entity exercising permissions granted -by this License. - -"Source" form shall mean the preferred form for making modifications, including -but not limited to software source code, documentation source, and configuration -files. - -"Object" form shall mean any form resulting from mechanical transformation or -translation of a Source form, including but not limited to compiled object code, -generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made -available under the License, as indicated by a copyright notice that is included -in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that -is based on (or derived from) the Work and for which the editorial revisions, -annotations, elaborations, or other modifications represent, as a whole, an -original work of authorship. For the purposes of this License, Derivative Works -shall not include works that remain separable from, or merely link (or bind by -name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version -of the Work and any modifications or additions to that Work or Derivative Works -thereof, that is intentionally submitted to Licensor for inclusion in the Work -by the copyright owner or by an individual or Legal Entity authorized to submit -on behalf of the copyright owner. For the purposes of this definition, -"submitted" means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, and -issue tracking systems that are managed by, or on behalf of, the Licensor for -the purpose of discussing and improving the Work, but excluding communication -that is conspicuously marked or otherwise designated in writing by the copyright -owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf -of whom a Contribution has been received by Licensor and subsequently -incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of this -License, each Contributor hereby grants to You a perpetual, worldwide, -non-exclusive, no-charge, royalty-free, irrevocable copyright license to -reproduce, prepare Derivative Works of, publicly display, publicly perform, -sublicense, and distribute the Work and such Derivative Works in Source or -Object form. - -3. Grant of Patent License. Subject to the terms and conditions of this -License, each Contributor hereby grants to You a perpetual, worldwide, -non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this -section) patent license to make, have made, use, offer to sell, sell, import, -and otherwise transfer the Work, where such license applies only to those patent -claims licensable by such Contributor that are necessarily infringed by their -Contribution(s) alone or by combination of their Contribution(s) with the Work -to which such Contribution(s) was submitted. If You institute patent litigation -against any entity (including a cross-claim or counterclaim in a lawsuit) -alleging that the Work or a Contribution incorporated within the Work -constitutes direct or contributory patent infringement, then any patent licenses -granted to You under this License for that Work shall terminate as of the date -such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the Work or -Derivative Works thereof in any medium, with or without modifications, and in -Source or Object form, provided that You meet the following conditions: - -(a) You must give any other recipients of the Work or Derivative Works a copy of -this License; and - -(b) You must cause any modified files to carry prominent notices stating that -You changed the files; and - -(c) You must retain, in the Source form of any Derivative Works that You -distribute, all copyright, patent, trademark, and attribution notices from the -Source form of the Work, excluding those notices that do not pertain to any part -of the Derivative Works; and - -(d) If the Work includes a "NOTICE" text file as part of its distribution, then -any Derivative Works that You distribute must include a readable copy of the -attribution notices contained within such NOTICE file, excluding those notices -that do not pertain to any part of the Derivative Works, in at least one of the -following places: within a NOTICE text file distributed as part of the -Derivative Works; within the Source form or documentation, if provided along -with the Derivative Works; or, within a display generated by the Derivative -Works, if and wherever such third-party notices normally appear. The contents -of the NOTICE file are for informational purposes only and do not modify the -License. You may add Your own attribution notices within Derivative Works that -You distribute, alongside or as an addendum to the NOTICE text from the Work, -provided that such additional attribution notices cannot be construed as -modifying the License. - -You may add Your own copyright statement to Your modifications and may provide -additional or different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works as a whole, -provided Your use,reproduction, and distribution of the Work otherwise complies -with the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, any -Contribution intentionally submitted for inclusion in the Work by You to the -Licensor shall be under the terms and conditions of this License, without any -additional terms or conditions. Notwithstanding the above, nothing herein shall -supersede or modify the terms of any separate license agreement you may have -executed with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade names, -trademarks, service marks, or product names of the Licensor, except as required -for reasonable and customary use in describing the origin of the Work and -reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or agreed to in -writing, Licensor provides the Work (and each Contributor provides its -Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied, including, without limitation, any warranties -or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -PARTICULAR PURPOSE. You are solely responsible for determining the -appropriateness of using or redistributing the Work and assume any risks -associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, whether in -tort (including negligence), contract, or otherwise, unless required by -applicable law (such as deliberate and grossly negligent acts) or agreed to in -writing, shall any Contributor be liable to You for damages, including any -direct, indirect, special, incidental, or consequential damages of any character -arising as a result of this License or out of the use or inability to use the -Work (including but not limited to damages for loss of goodwill, work stoppage, -computer failure or malfunction, or any and all other commercial damages or -losses), even if such Contributor has been advised of the possibility of such -damages. - -9. Accepting Warranty or Additional Liability. While redistributing the Work -or Derivative Works thereof, You may choose to offer,and charge a fee for, -acceptance of support, warranty, indemnity, or other liability obligations -and/or rights consistent with this License. However, in accepting such -obligations, You may act only on Your own behalf and on Your sole -responsibility, not on behalf of any other Contributor, and only if You agree to -indemnify, defend, and hold each Contributor harmless for any liability incurred -by, or claims asserted against, such Contributor by reason of your accepting any -such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - -To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "[]" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included on -the same "printed page" as the copyright notice for easier identification within -third-party archives. - - Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed -under the License is distributed on an "AS IS" BASIS,WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. - -%% The following software may be included in this product: NSIS 1.0j; Use of -any of this software is governed by the terms of the license below: -Copyright (C) 1999-2000 Nullsoft, Inc. - -This software is provided 'as-is', without any express or implied warranty. In -no event will the authors be held liable for any damages arising from the use of -this software. Permission is granted to anyone to use this software for any -purpose, including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not claim -that you wrote the original software. If you use this software in a product, an -acknowledgment in the product documentation would be appreciated but is not -required. - -2. Altered source versions must be plainly marked as such, and must not be -misrepresented as being the original software. - -3. This notice may not be removed or altered from any source distribution. -Justin Frankel justin@nullsoft.com" - -%% Some Portions licensed from IBM are available at: -http://www.ibm.com/software/globalization/icu/ - -%% Portions Copyright Eastman Kodak Company 1992 - -%% Lucida is a registered trademark or trademark of Bigelow & Holmes in the U.S. -and other countries. - -%% Portions licensed from Taligent, Inc. - -%% The following software may be included in this product:IAIK PKCS Wrapper; Use -of any of this software is governed by the terms of the license below: - -Copyright (c) 2002 Graz University of Technology. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification,are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -3. The end-user documentation included with the redistribution, if any, must -include the following acknowledgment: - - "This product includes software developed by IAIK of Graz University of Technology." - -Alternately, this acknowledgment may appear in the software itself, if and -wherever such third-party acknowledgments normally appear. - -4. The names "Graz University of Technology" and "IAIK of Graz University of -Technology" must not be used to endorse or promote products derived from this -software without prior written permission. - -5. Products derived from this software may not be called "IAIK PKCS Wrapper", -nor may "IAIK" appear in their name, without prior written permission of Graz -University of Technology. - -THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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 LICENSOR -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. - -%% The following software may be included in this product: Document Object -Model (DOM) v. Level 3; Use of any of this software is governed by the terms of -the license below: - -W3C SOFTWARE NOTICE AND LICENSE - -http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 - -This work (and included software, documentation such as READMEs, or other -related items) is being provided by the copyright holders under the following -license. By obtaining, using and/or copying this work, you (the licensee) agree -that you have read, understood, and will comply with the following terms and -conditions. - -Permission to copy, modify, and distribute this software and its documentation, -with or without modification, for any purpose and without fee or royalty is -hereby granted, provided that you include the following on ALL copies of the -software and documentation or portions thereof, including modifications: - -1.The full text of this NOTICE in a location viewable to users of the -redistributed or derivative work. - -2.Any pre-existing intellectual property disclaimers, notices, or terms and - conditions. If none exist, the W3C Software Short Notice should be included - (hypertext is preferred, text is permitted) within the body of any - redistributed or derivative code. - -3.Notice of any changes or modifications to the files, including the date - changes were made. (We recommend you provide URIs to the location from which - the code is derived.) - -THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS -MAKENO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT -LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE -OR THAT THEUSE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD -PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. - -COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL -ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION. -The name and trademarks of copyright holders may NOT be used in advertising or -publicity pertaining to the software without specific, written prior permission. -Title to copyright in this software and any associated documentation will at all -times remain with copyright holders. - -____________________________________ - -This formulation of W3C's notice and license became active on December 31 2002. -This version removes the copyright ownership notice such that this license can -be used with materials other than those owned by the W3C, reflects that ERCIM is -now a host of the W3C, includes references to this specific dated version of the -license, and removes the ambiguous grant of "use". Otherwise, this version is -the same as the previous version and is written so as to preserve the Free -Software Foundation's assessment of GPL compatibility and OSI's certification -under the Open Source Definition. Please see our Copyright FAQ for common -questions about using materials from our site, including specific terms and -conditions for packages like libwww, Amaya, and Jigsaw. Other questions about -this notice can be directed to site-policy@w3.org. - -%% The following software may be included in this product: Xalan, Xerces; Use -of any of this software is governed by the terms of the license below: /* - - * The Apache Software License, Version 1.1 - * - * - * Copyright (c) 1999-2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Xerces" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS 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 software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 1999, International - * Business Machines, Inc., http://www.ibm.com. For more - * information on the Apache Software Foundation, please see http://www.apache.org - * - -%% The following software may be included in this product: W3C XML Conformance -Test Suites v. 20020606; Use of any of this software is governed by the terms -of the license below: - -W3C SOFTWARE NOTICE AND LICENSE - -Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of -Technology, Institut National de Recherche en Informatique et en -Automatique,Keio University). All Rights Reserved. -http://www.w3.org/Consortium/Legal/ - -This W3C work (including software, documents, or other related items) is being -provided by the copyright holders under the following license. By -obtaining,using and/or copying this work, you (the licensee) agree that you have -read,understood, and will comply with the following terms and conditions: - -Permission to use, copy, modify, and distribute this software and its -documentation, with or without modification, for any purpose and without fee -orroyalty is hereby granted, provided that you include the following on ALL -copiesof the software and documentation or portions thereof, including -modifications,that you make: - -1. The full text of this NOTICE in a location viewable to users of the -redistributed or derivative work. - -2. Any pre-existing intellectual property disclaimers, notices, or terms and -conditions. If none exist, a short notice of the following form (hypertext is -preferred, text is permitted) should be used within the body of any -redistributed or derivative code: "Copyright [$date-of-software] World Wide Web -Consortium, (Massachusetts Institute of Technology, Institut National -deRecherche en Informatique et en Automatique, Keio University). All Rights -Reserved. http://www.w3.org/Consortium/Legal/" - -3. Notice of any changes or modifications to the W3C files, including the date -changes were made. (We recommend you provide URIs to the location from which -the code is derived.) - -THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS -MAKENO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT -LIMITEDTO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE -OR THATTHE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD -PARTYPATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. - -COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL -ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION. - -The name and trademarks of copyright holders may NOT be used in advertising or -publicity pertaining to the software without specific, written prior permission. -Title to copyright in this software and any associated documentation will at all -times remain with copyright holders. - -____________________________________ - -This formulation of W3C's notice and license became active on August 14 1998 -soas to improve compatibility with GPL. This version ensures that W3C software -licensing terms are no more restrictive than GPL and consequently W3C software -may be distributed in GPL packages. See the older formulation for the policy -prior to this date. Please see our Copyright FAQ for common questions about -using materials from our site, including specific terms and conditions for -packages like libwww, Amaya, and Jigsaw. Other questions about this notice can -be directed to site-policy@w3.org. - -%% The following software may be included in this product: W3C XML Schema Test -Collection v. 1.16.2; Use of any of this software is governed by the terms of -the license below: W3C DOCUMENT NOTICE AND LICENSE - -Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of -Technology, Institut National de Recherche en Informatique et en -Automatique,Keio University). All Rights Reserved. -http://www.w3.org/Consortium/Legal/ - -Public documents on the W3C site are provided by the copyright holders under the -following license. The software or Document Type Definitions (DTDs) associated -with W3C specifications are governed by the Software Notice. By using and/or -copying this document, or the W3C document from which this statement is -linked,you (the licensee) agree that you have read, understood, and will comply -with the following terms and conditions: - -Permission to use, copy, and distribute the contents of this document, or theW3C -document from which this statement is linked, in any medium for any purpose and -without fee or royalty is hereby granted, provided that you include the -following on ALL copies of the document, or portions thereof, that you use: - -1. A link or URL to the original W3C document. - -2. The pre-existing copyright notice of the original author, or if it doesn't -exist, a notice of the form: "Copyright [$date-of-document] World Wide -WebConsortium, (Massachusetts Institute of Technology, Institut National -deRecherche en Informatique et en Automatique, Keio University). All Rights -Reserved. http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but -atextual representation is permitted.) - -3. If it exists, the STATUS of the W3C document. - -When space permits, inclusion of the full text of this NOTICE should be -provided. We request that authorship attribution be provided in any -software,documents, or other items or products that you create pursuant to the -implementation of the contents of this document, or any portion thereof. - -No right to create modifications or derivatives of W3C documents is granted -pursuant to this license. However, if additional requirements (documented in -the Copyright FAQ) are satisfied, the right to create modifications or -derivatives is sometimes granted by the W3C to individuals complying with those -requirements. THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO -REPRESENTATIONSOR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -WARRANTIES OFMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, -NON-INFRINGEMENT, OR TITLE;THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR -ANY PURPOSE; NOR THAT THEIMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY -THIRD PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. - -COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL -ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE -PERFORMANCEOR IMPLEMENTATION OF THE CONTENTS THEREOF. - -The name and trademarks of copyright holders may NOT be used in advertising or -publicity pertaining to this document or its contents without specific, written -prior permission. Title to copyright in this document will at all times remain -with copyright holders. - ----------------------------------------------------------------------------- - -This formulation of W3C's notice and license became active on April 05 1999 soas -to account for the treatment of DTDs, schema's and bindings. See the older -formulation for the policy prior to this date. Please see our Copyright FAQ for -common questions about using materials from our site, including specific terms -and conditions for packages like libwww, Amaya, and Jigsaw. Other questions -about this notice can be directed to site-policy@w3.org. webmaster (last -updated by reagle on 1999/04/99.) - - -%% The following software may be included in this product: Mesa 3-D graphics -library v. 5; Use of any of this software is governed by the terms of the -license below: - -core Mesa code include/GL/gl.h Brian Paul -Mesa GLX driver include/GL/glx.h Brian Paul -Mesa Ext registry include/GL/glext.h SGI -SGI Free B include/GL/glxext.h - -Mesa license: - -The Mesa distribution consists of several components. Different copyrights and -licenses apply to different components. For example, GLUT is copyrighted by -Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa device -drivers are copyrighted by their authors. See below for a list of Mesa's -components and the copyright/license for each. - -The core Mesa library is licensed according to the terms of the XFree86copyright -(an MIT-style license). This allows integration with the XFree86/DRIproject. -Unless otherwise stated, the Mesa source code and documentation is licensed as -follows: - -Copyright (C) 1999-2003 Brian Paul All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"),to deal in the -Software without restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense,and/or sell copies of the -Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESSOR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALLBRIAN PAUL BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER INAN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000]) -1. Definitions. - -1.1 "Additional Notice Provisions" means such additional provisions as appear in -the Notice in Original Code under the heading "Additional Notice Provisions." - -1.2 "Covered Code" means the Original Code or Modifications, or any combination -thereof. - -1.3 "Hardware" means any physical device that accepts input, processes input, -stores the results of processing, and/or provides output. - -1.4 "Larger Work" means a work that combines Covered Code or portions thereof -with code not governed by the terms of this License. - -1.5 "Licensable" means having the right to grant, to the maximum extent -possible, whether at the time of the initial grant or subsequently acquired, any -and all of the rights conveyed herein. - -1.6 "License" means this document. - -1.7 "Licensed Patents" means patent claims Licensable by SGI that are infringed -by the use or sale of Original Code or any Modifications provided by SGI, or any -combination thereof. - -1.8 "Modifications" means any addition to or deletion from the substance or -structure of the Original Code or any previous Modifications. When Covered Code -is released as a series of files, a Modification is: A. Any addition to the -contents of a file containing Original Code and/or addition to or deletion from -the contents of a file containing previous Modifications.B. Any new file that -contains any part of the Original Code or previous Modifications. - -1.9 "Notice" means any notice in Original Code or Covered Code, as required by -and in compliance with this License. - -1.10 "Original Code" means source code of computer software code that is -described in the source code Notice required by Exhibit A as Original Code, and -updates and error corrections specifically thereto. - -1.11 "Recipient" means an individual or a legal entity exercising rights under, -and complying with all of the terms of, this License or a future version of this -License issued under Section 8. For legal entities, "Recipient" includes any -entity that controls, is controlled by, or is under common control with -Recipient. For purposes of this definition, "control" of an entity means (a) -the power, direct or indirect, to direct or manage such entity, or (b) ownership -of fifty percent (50%) or more of the outstanding shares or beneficial ownership -of such entity. - -1.12 "Recipient Patents" means patent claims Licensable by a Recipient that are -infringed by the use or sale of Original Code or any Modifications provided by -SGI, or any combination thereof. - -1.13 "SGI" means Silicon Graphics, Inc. - -1.14 "SGI Patents" means patent claims Licensable by SGI other than the Licensed -Patents. - -2. License Grant and Restrictions. - -2.1 SGI License Grant. Subject to the terms of this License and any third party -intellectual property claims, for the duration of intellectual property -protections inherent in the Original Code, SGI hereby grants Recipient a -worldwide, royalty-free, non-exclusive license, to do the following: (i) under -copyrights Licensable by SGI, to reproduce, distribute, create derivative works -from, and, to the extent applicable, display and perform the Original Code -and/or any Modifications provided by SGI alone and/or as part of a Larger Work; -and (ii) under any Licensable Patents, to make, have made, use, sell, offer for -sale, import and/or otherwise transfer the Original Code and/or any -Modifications provided by SGI. Recipient accepts the terms and conditions of -this License by undertaking any of the aforementioned actions. The patent -license shall apply to the Covered Code if, at the time any related Modification -is added, such addition of the Modification causes such combination to be -covered by the Licensed Patents . The patent license in Section 2.1(ii) shall -not apply to any other combinations that include the Modification. No patent -license is provided under SGI Patents for infringements of SGI Patents by -Modifications not provided by SGI or combinations of Original Code and -Modifications not provided by SGI. - -2.2 Recipient License Grant. Subject to the terms of this License and any third -party intellectual property claims, Recipient hereby grants SGI and any other -Recipients a worldwide, royalty-free, non-exclusive license, under any Recipient -Patents, to make, have made, use, sell, offer for sale, import and/or otherwise -transfer the Original Code and/or any Modifications provided by SGI. - -2.3 No License For Hardware Implementations. The licenses granted in Section -2.1 and 2.2 are not applicable to implementation in Hardware of the algorithms -embodied in the Original Code or any Modifications provided by SGI . - -3. Redistributions. - -3.1 Retention of Notice/Copy of License. The Notice set forth in Exhibit A, -below, must be conspicuously retained or included in any and all redistributions -of Covered Code. For distributions of the Covered Code in source code form, the -Notice must appear in every file that can include a text comments field; in -executable form, the Notice and a copy of this License must appear in related -documentation or collateral where the Recipient's rights relating to Covered -Code are described. Any Additional Notice Provisions which actually appears in -the Original Code must also be retained or included in any and all -redistributions of Covered Code. - -3.2 Alternative License. Provided that Recipient is in compliance with the -terms of this License, Recipient may, so long as without derogation of any of -SGI's rights in and to the Original Code, distribute the source code and/or -executable version(s) of Covered Code under (1) this License; (2) a license -identical to this License but for only such changes as are necessary in order to -clarify Recipient's role as licensor of Modifications; and/or (3) a license of -Recipient's choosing, containing terms different from this License, provided -that the license terms include this Section 3 and Sections 4, 6, 7, 10, 12, and -13, which terms may not be modified or superseded by any other terms of such -license. If Recipient elects to use any license other than this License, -Recipient must make it absolutely clear that any of its terms which differ from -this License are offered by Recipient alone, and not by SGI. It is emphasized -that this License is a limited license, and, regardless of the license form -employed by Recipi ent in accordance with this Section 3.2, Recipient may -relicense only such rights, in Original Code and Modifications by SGI, as it has -actually been granted by SGI in this License. - -3.3 Indemnity. Recipient hereby agrees to indemnify SGI for any liability -incurred by SGI as a result of any such alternative license terms Recipient -offers. - -4. Termination. This License and the rights granted hereunder will terminate -automatically if Recipient breaches any term herein and fails to cure such -breach within 30 days thereof. Any sublicense to the Covered Code that is -properly granted shall survive any termination of this License, absent -termination by the terms of such sublicense. Provisions that, by their nature, -must remain in effect beyond the termination of this License, shall survive. - -5. No Trademark Or Other Rights. This License does not grant any rights to: -(i) any software apart from the Covered Code, nor shall any other rights or -licenses not expressly granted hereunder arise by implication, estoppel or -otherwise with respect to the Covered Code; (ii) any trade name, trademark or -service mark whatsoever, including without limitation any related right for -purposes of endorsement or promotion of products derived from the Covered Code, -without prior written permission of SGI; or (iii) any title to or ownership of -the Original Code, which shall at all times remains with SGI. All rights in the -Original Code not expressly granted under this License are reserved. - -6. Compliance with Laws; Non-Infringement. There are various worldwide laws, -regulations, and executive orders applicable to dispositions of Covered Code, -including without limitation export, re-export, and import control laws, -regulations, and executive orders, of the U.S. government and other countries, -and Recipient is reminded it is obliged to obey such laws, regulations, and -executive orders. Recipient may not distribute Covered Code that (i) in any way -infringes (directly or contributorily) any intellectual property rights of any -kind of any other person or entity or (ii) breaches any representation or -warranty, express, implied or statutory, to which, under any applicable law, it -might be deemed to have been subject. - -7. Claims of Infringement. If Recipient learns of any third party claim that -any disposition of Covered Code and/or functionality wholly or partially -infringes the third party's intellectual property rights, Recipient will -promptly notify SGI of such claim. - -8. Versions of the License. SGI may publish revised and/or new versions of the -License from time to time, each with a distinguishing version number. Once -Covered Code has been published under a particular version of the License, -Recipient may, for the duration of the license, continue to use it under the -terms of that version, or choose to use such Covered Code under the terms of any -subsequent version published by SGI. Subject to the provisions of Sections 3 -and 4 of this License, only SGI may modify the terms applicable to Covered Code -created under this License. - -9. DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED "AS IS." ALL EXPRESS AND -IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, -ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, -FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. SGI ASSUMES NO RISK AS -TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD THE SOFTWARE PROVE -DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR SERVICING, REPAIR -OR CORRECTION. THIS DISCLAIMER OF WARRANTY IS AN ESSENTIAL PART OF THIS -LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO -THIS DISCLAIMER. - -10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES NOR LEGAL THEORY, WHETHER -TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY), CONTRACT, -OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY DIRECT, INDIRECT, -SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, -WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF DATA, -COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR -LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH -DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR -PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO THE EXTENT APPLICABLE LAW -PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR -LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND -LIMITATION MAY NOT APPLY TO RECIPIENT. - -11. Indemnity. Recipient shall be solely responsible for damages arising, -directly or indirectly, out of its utilization of rights under this License. -Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc. from -and against any loss, liability, damages, costs or expenses (including the -payment of reasonable attorneys fees) arising out of Recipient's use, -modification, reproduction and distribution of the Covered Code or out of any -representation or warranty made by Recipient. - -12. U.S. Government End Users. The Covered Code is a "commercial item" -consisting of "commercial computer software" as such terms are defined in title -48 of the Code of Federal Regulations and all U.S. Government End Users acquire -only the rights set forth in this License and are subject to the terms of this -License. - -13. Miscellaneous. This License represents the complete agreement concerning -the its subject matter. If any provision of this License is held to be -unenforceable, such provision shall be reformed so as to achieve as nearly as -possible the same legal and economic effect as the original provision and the -remainder of this License will remain in effect. This License shall be governed -by and construed in accordance with the laws of the United States and the State -of California as applied to agreements entered into and to be performed entirely -within California between California residents. Any litigation relating to this -License shall be subject to the exclusive jurisdiction of the Federal Courts of -the Northern District of California (or, absent subject matter jurisdiction in -such courts, the courts of the State of California), with venue lying -exclusively in Santa Clara County, California, with the losing party responsible -for costs, including without limitation, court costs and reasonable attorneys -fees and ex penses. The application of the United Nations Convention on -Contracts for the International Sale of Goods is expressly excluded. Any law or -regulation that provides that the language of a contract shall be construed -against the drafter shall not apply to this License. - -Exhibit A License Applicability. Except to the extent portions of this file are -made subject to an alternative license as permitted in the SGI Free Software -License B, Version 1.1 (the "License"), the contents of this file are subject -only to the provisions of the License. You may not use this file except in -compliance with the License. You may obtain a copy of the License at Silicon -Graphics, Inc., attn: Legal Services, 1600 Amphitheatre Parkway, Mountain View, -CA 94043-1351, or at: http://oss.sgi.com/projects/FreeB Note that, as provided -in the License, the Software is distributed on an "AS IS" basis, with ALL -EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS DISCLAIMED, INCLUDING, WITHOUT -LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, -SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -Original Code. The Original Code is: [name of software, version number, and -release date], developed by Silicon Graphics, Inc. The Original Code is -Copyright (c) [dates of first publication, as appearing in the Notice in the -Original Code] Silicon Graphics, Inc. Copyright in any portions created by -third parties is as indicated elsewhere herein. All Rights Reserved. -Additional Notice Provisions: [such additional provisions, if any, as appear in -the Notice in the Original Code under the heading "Additional Notice -Provisions"] - -%% The following software may be included in this product: Byte Code -Engineering Library (BCEL) v. 5; Use of any of this software is governed by the -terms of the license below: - -Apache Software License - -/ -==================================================================== -The Apache Software License, Version 1.1 - -Copyright (c) 2001 The Apache Software Foundation. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials providedwith the distribution. - -3. The end-user documentation included with the redistribution, if any, must -include the following acknowledgment: "This product includes software developed -by the Apache Software Foundation (http://www.apache.org/)." Alternately, this -acknowledgment may appear in the software itself, if and wherever such -third-party acknowledgments normally appear. - -4. The names "Apache" and "Apache Software Foundation"and "Apache BCEL" must -not be used to endorse or promote products derived from this software without -prior written permission. For written permission, please contact -apache@apache.org. - -5. Products derived from this software may not be called"Apache", "Apache -BCEL", nor may "Apache" appear in their name,without prior written permission of -the Apache Software Foundation. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED ORIMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIEDWARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSEARE DISCLAIMED. IN NO EVENT SHALL THE APACHE -SOFTWAREFOUNDATION OR ITS CONTRIBUTORS 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) HOWEVERCAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICTLIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING INANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THEPOSSIBILITY OF SUCH DAMAGE. -==================================================================== - -This software consists of voluntary contributions made by many individuals on -behalf of the Apache Software Foundation. For more information on the Apache -Software Foundation, please see http://www.apache.org. / - - - -%% The following software may be included in this product: Regexp, Regular -Expression Package v. 1.2; Use of any of this software is governed by the terms -of the license below: The Apache Software License, Version 1.1 - -Copyright (c) 2001 The Apache Software Foundation. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification,are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -3. The end-user documentation included with the redistribution, if any, must -include the following acknowledgment: "This product includes software developed -by the Apache Software Foundation (http://www.apache.org/)." Alternately, this -acknowledgment may appear in the software itself, if and wherever such -third-party acknowledgments normally appear. - -4. The names "Apache" and "Apache Software Foundation" and "Apache Turbine" -must not be used to endorse or promote products derived from this software -without prior written permission. For written permission, please contact -apache@apache.org. - -5. Products derived from this software may not be called "Apache", "Apache -Turbine", nor may "Apache" appear in their name, without prior written -permission of the Apache Software Foundation. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE -SOFTWARE FOUNDATION OR ITS CONTRIBUTORS 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 software consists of voluntary contributions made by many individuals on -behalf of the Apache Software Foundation. For more information on the Apache -Software Foundation, please see http://www.apache.org. - -%% The following software may be included in this product: CUP Parser Generator -for Java v. 0.10k; Use of any of this software is governed by the terms of the -license below: CUP Parser Generator Copyright Notice, License, and Disclaimer - -Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, provided that -the above copyright notice appear in all copies and that both the copyright -notice and this permission notice and warranty disclaimer appear in supporting -documentation, and that the names of the authors or their employers not be used -in advertising or publicity pertaining to distribution of the software without -specific, written prior permission. - -The authors and their employers disclaim all warranties with regard to this -software, including all implied warranties of merchantability and fitness. In -no event shall the authors or their employers be liable for any special, -indirect or consequential damages or any damages whatsoever resulting from loss -of use, data or profits, whether in an action of contract,negligence or other -tortious action, arising out of or in connection with the use or performance of -this software. - -%% The following software may be included in this product: JLex: A Lexical -Analyzer Generator for Java v. 1.2.5; Use of any of this software is governed -by the terms of the license below: JLEX COPYRIGHT NOTICE, LICENSE AND -DISCLAIMER. - -Copyright 1996-2003 by Elliot Joel Berk and C. Scott Ananian - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, provided that -the above copyright notice appear in all copies and that both the copyright -notice and this permission notice and warranty disclaimer appear in supporting -documentation, and that the name of the authors or their employers not be used -in advertising or publicity pertaining to distribution of the software without -specific, written prior permission. - -The authors and their employers disclaim all warranties with regard to this -software, including all implied warranties of merchantability and fitness. In -no event shall the authors or their employers be liable for any special, -indirect or consequential damages or any damages whatsoever resulting from loss -of use, data or profits, whether in an action of contract, negligence or other -tortious action, arising out of or in connection with the use or performance of -this software. - -Java is a trademark of Sun Microsystems, Inc. References to the Java -programming language in relation to JLex are not meant to imply that Sun -endorses this product. - -%% The following software may be included in this product: SAX v. 2.0.1; Use -of any of this software is governed by the terms of the license below: -Copyright Status - -SAX is free! - -In fact, it's not possible to own a license to SAX, since it's been placed in -the public domain. - -No Warranty - -Because SAX is released to the public domain, there is no warranty for the -design or for the software implementation, to the extent permitted by applicable -law. Except when otherwise stated in writing the copyright holders and/or other -parties provide SAX "as is" without warranty of any kind, either expressed or -implied, including, but not limited to, the implied warranties of -merchantability and fitness for a particular purpose. The entire risk as to the -quality and performance of SAX is with you. Should SAX prove defective, you -assume the cost of all necessary servicing, repair or correction. - -In no event unless required by applicable law or agreed to in writing will any -copyright holder, or any other party who may modify and/or redistribute SAX, be -liable to you for damages, including any general, special, incidental or -consequential damages arising out of the use or inability to use SAX (including -but not limited to loss of data or data being rendered inaccurate or losses -sustained by you or third parties or a failure of the SAX to operate with any -other programs), even if such holder or other party has been advised of the -possibility of such damages. - -Copyright Disclaimers - -This page includes statements to that effect by David Megginson, who would have -been able to claim copyright for the original work. - -SAX 1.0 - -Version 1.0 of the Simple API for XML (SAX), created collectively by the -membership of the XML-DEV mailing list, is hereby released into the public -domain. - -No one owns SAX: you may use it freely in both commercial and non-commercial -applications, bundle it with your software distribution, include it on a CD-ROM, -list the source code in a book, mirror the documentation at your own web site, -or use it in any other way you see fit. - -David Megginson, sax@megginson.com -1998-05-11 - -SAX 2.0 - -I hereby abandon any property rights to SAX 2.0 (the Simple API for XML), and -release all of the SAX 2.0 source code, compiled code, and documentation -contained in this distribution into the Public Domain. SAX comes with NO -WARRANTY or guarantee of fitness for any purpose. - -David Megginson, david@megginson.com -2000-05-05 - -%% The following software may be included in this product: Cryptix; Use of any -of this software is governed by the terms of the license below: - -Cryptix General License - -Copyright © 1995-2003 The Cryptix Foundation Limited. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1.Redistributions of source code must retain the copyright notice, this list of -conditions and the following disclaimer. - -2.Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY -THE CRYPTIX FOUNDATION LIMITED AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS -ORIMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FORA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -SHALL THE CRYPTIX FOUNDATION LIMITED OR CONTRIBUTORS BELIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOTLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESSINTERRUPTION) 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 OFTHE POSSIBILITY OF SUCH DAMAGE. - -%% The following software may be included in this product: W3C XML Schema Test -Collection; Use of any of this software is governed by the terms of the license -below: - -W3C DOCUMENT NOTICE AND LICENSE - -Copyright 1994-2002 World Wide Web Consortium, (Massachusetts Institute of -Technology, Institut National de Recherche en Informatique et en -Automatique,Keio University). All Rights Reserved. - -http://www.w3.org/Consortium/Legal/ - -Public documents on the W3C site are provided by the copyright holders under the -following license. The software or Document Type Definitions (DTDs) associated -with W3C specifications are governed by the Software Notice. By using and/or -copying this document, or the W3C document from which this statement is -linked,you (the licensee) agree that you have read, understood, and will comply -with the following terms and conditions: - -Permission to use, copy, and distribute the contents of this document, or theW3C -document from which this statement is linked, in any medium for any purpose and -without fee or royalty is hereby granted, provided that you include the -following on ALL copies of the document, or portions thereof, that you use: - -1. A link or URL to the original W3C document. -2. The pre-existing copyright notice of the original author, or if it doesn't -exist, a notice of the form: "Copyright [$date-of-document] World Wide Web -Consortium, (Massachusetts Institute of Technology, Institut National -deRecherche en Informatique et en Automatique, Keio University). All Rights -Reserved. http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but a -textual representation is permitted.) -3. If it exists, the STATUS of the W3C document. - -When space permits, inclusion of the full text of this NOTICE should be -provided. We request that authorship attribution be provided in any -software,documents, or other items or products that you create pursuant to the -implementation of the contents of this document, or any portion thereof. - -No right to create modifications or derivatives of W3C documents is granted -pursuant to this license. However, if additional requirements (documented in -the Copyright FAQ) are satisfied, the right to create modifications or -derivatives is sometimes granted by the W3C to individuals complying with those -requirements. - -THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO -REPRESENTATIONSOR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -WARRANTIES OFMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, -NON-INFRINGEMENT, OR TITLE;THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR -ANY PURPOSE; NOR THAT THEIMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY -THIRD PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. - -COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL -ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE -PERFORMANCEOR IMPLEMENTATION OF THE CONTENTS THEREOF. - -The name and trademarks of copyright holders may NOT be used in advertising or -publicity pertaining to this document or its contents without specific, written -prior permission. Title to copyright in this document will at all times remain -with copyright holders. - ----------------------------------------------------------------------------- - -This formulation of W3C's notice and license became active on April 05 1999 so -as to account for the treatment of DTDs, schema's and bindings. See the older -formulation for the policy prior to this date. Please see our Copyright FAQ for -common questions about using materials from our site, including specific terms -and conditions for packages like libwww, Amaya, and Jigsaw. Other questions -about this notice can be directed to site-policy@w3.org. webmaster (last -updated by reagle on 1999/04/99.) - -%% The following software may be included in this product: Stax API; Use of any -of this software is governed by the terms of the license below: - -Streaming API for XML (JSR-173) Specification -Reference Implementation -License Agreement - -READ THE TERMS OF THIS (THE "AGREEMENT") CAREFULLY BEFORE VIEWING OR USING -THESOFTWARE LICENSED HEREUNDER. BY VIEWING OR USING THE SOFTWARE, YOU AGREE TO -THE TERMS OF THISAGREEMENT. IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, -INDICATE YOUR ACCEPTANCE OF THESETERMS BY SELECTING THE "ACCEPT" BUTTON AT THE -END OF THIS AGREEMENT. IF YOU DO NOT AGREE TOALL THESE TERMS, PROMPTLY RETURN -THE UNUSED SOFTWARE TO ORIGINAL CONTRIBUTOR, DEFINED HEREIN. - -1.0 DEFINITIONS. - -1.1. "BEA" means BEA Systems, Inc., the licensor of the Original Code. - -1.2. "Contributor" means BEA and each entity that creates or contributes to the -creation of Modifications. - -1.3. "Covered Code" means the Original Code or Modifications or the combination -of the Original Code and Modifications, in each case including portions thereof -and corresponding documentation released with the source code. - -1.4. "Executable" means Covered Code in any form other than Source Code. - -1.5. "FCS" means first commercial shipment of a product. - -1.6. "Modifications" means any addition to or deletion from the substance or -structure of either the Original Code or any previous Modifications. When -Covered Code is released as a series of files, a Modification is: - -(a) Any addition to or deletion from the contents of a file containing Original -Code or previous Modifications. - -(b) Any new file that contains any part of the Original Code or previous -Modifications. - -1.7. "Original Code" means Source Code of computer software code Reference -Implementation. - -1.8. "Patent Claims" means any patent claim(s), now owned or hereafter -acquired,including without limitation, method, process, and apparatus claims, in -any patent for which the grantor has the right to grant a license. - -1.9. "Reference Implementation" means the prototype or "proof of -concept"implementation of the Specification developed and made available for -license by or on behalf of BEA. - -1.10. "Source Code" means the preferred form of the Covered Code for making -modifications to it, including all modules it contains, plus any associated -documentation,interface definition files, scripts used to control compilation -and installation of an Executable, or source code differential comparisons -against either the Original Code or another well known,available Covered Code of -the Contributor's choice. - -1.11. "Specification" means the written specification for the Streaming API for -XML , Java technology developed pursuant to the Java Community Process. - -1.12. "Technology Compatibility Kit" or "TCK" means the documentation, testing -tools and test suites associated with the Specification as may be revised by BEA -from time to time, that is provided so that an implementer of the Specification -may determine if its implementation is compliant with the Specification. - -1.13. "You" (or "Your") means an individual or a legal entity exercising rights -under, and complying with all of the terms of, this Agreement or a future -version of this Agreement issued under Section 6.1. For legal entities, "You" -includes any entity which controls,is controlled by, or is under common control -with You. For purposes of this definition,"control" means (a) the power, direct -or indirect, to cause the direction or management of such entity, whether by -contract or otherwise, or (b) ownership of more than fifty percent (50%) of the -outstanding shares or beneficial ownership of such entity. - -2.0 SOURCE CODE LICENSE. - -2.1. Copyright Grant. Subject to the terms of this Agreement, each Contributor -hereby grants You a non-exclusive, worldwide, royalty-free copyright license to -reproduce,prepare derivative works of, publicly display, publicly perform, -distribute and sublicense the Covered Code of such Contributor, if any, and such -derivative works, in Source Code and Executable form. - -2.2. Patent Grant. Subject to the terms of this Agreement, each Contributor -hereby grants You a non-exclusive, worldwide, royalty-free patent license under -the Patent Claims to make, use, sell, offer to sell, import and otherwise -transfer the Covered Code prepared and provided by such Contributor, if any, in -Source Code and Executable form. This patent license shall apply to the Covered -Code if, at the time a Modification is added by the Contributor,such addition of -the Modification causes such combination to be covered by the Patent Claims. -The patent license shall not apply to any other combinations which include the -Modification. - -2.3. Conditions to Grants. You understand that although each Contributor -grants the licenses to the Covered Code prepared by it, no assurances are -provided by any Contributor that the Covered Code does not infringe the patent -or other intellectual property rights of any other entity. Each Contributor -disclaims any liability to You for claims brought by any other entity based on -infringement of intellectual property rights or otherwise. As a condition to -exercising the rights and licenses granted hereunder, You hereby assume sole -responsibility to secure any other intellectual property rights needed, if any. -For example, if a thirdparty patent license is required to allow You to -distribute Covered Code, it is Your responsibility to acquire that license -before distributing such code. - -2.4. Contributors' Representation. Each Contributor represents that to its -knowledge it has sufficient copyright rights in the Covered Code it provides , -if any, to grant the copyright license set forth in this Agreement. - -3.0 DISTRIBUION RESTRICTIONS. - -3.1. Application of Agreement. - -The Modifications which You create or to which You contribute are governed by -the terms of this Agreement, including without limitation Section 2.0. The -Source Code version of Covered Code may be distributed only under the terms of -this Agreement or a future version of this Agreement released under Section 6.1, -and You must include a copy of this Agreement with every copy of the Source Code -You distribute. You may not offer or impose any terms on any Source Code -version that alters or restricts the applicable version of this Agreement or the -recipients' rights hereunder. However, You may include an additional document -offering the additional rights described in Section 3.3. - -3.2. Description of Modifications. - -You must cause all Covered Code to which You contribute to contain a file -documenting the changes You made to create that Covered Code and the date of any -change. You must include a prominent statement that the Modification is -derived, directly or indirectly, from Original Code provided by BEA and -including the name of BEA in (a) the Source Code, and (b) in any notice in an -Executable version or related documentation in which You describe the origin or -ownership of the Covered Code. - -%% The following software may be included in this product: X Window System; Use -of any of this software is governed by the terms of the license below: -Copyright The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that the -above copyright notice appear in all copies and that both that copyright notice -and this permission notice appear in supporting documentation. - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESSFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE OPEN -GROUPBE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OFCONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH -THESOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be used -in advertising or otherwise to promote the sale, use or other dealings in this -Software without prior written authorization from The Open Group. - -Portions also covered by other licenses as noted in the above URL. - -%% The following software may be included in this product: dom4j v. 1.6; Use -of any of this software is governed by the terms of the license below: - -Redistribution and use of this software and associated documentation -("Software"), with or without modification, are permitted provided that the -following conditions are met: - -1. Redistributions of source code must retain copyright statements and notices -Redistributions must also contain a copy of this document. - -2. Redistributions in binary form must reproduce the above copyright -notice,this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -3. The name "DOM4J" must not be used to endorse or promote products derived -from this Software without prior written permission of MetaStuff, Ltd. For -written permission, please contact dom4j-info@metastuff.com. - -4. Products derived from this Software may not be called "DOM4J" nor may"DOM4J" -appear in their names without prior written permission of MetaStuff,Ltd. DOM4J -is a registered trademark of MetaStuff, Ltd. - -5. Due credit should be given to the DOM4J Project - http://www.dom4j.org - -THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS ``AS IS'' AND -ANYEXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIEDWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -AREDISCLAIMED. IN NO EVENT SHALL METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE -FORANY 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 ONANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THISSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. - -%% The following software may be included in this product: Retroweaver; Use of -any of this software is governed by the terms of the license below: - -Copyright (c) February 2004, Toby Reyelts All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. Redistributions in binary form must -reproduce the above copyright notice, this list of conditions and the following -disclaimer in the documentation and/or other materials provided with the -distribution. Neither the name of Toby Reyelts nor the names of his -contributors may be used to endorse or promote products derived from this -software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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, STRICTLIABILITY, 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. - -%% The following software may be included in this product: stripper; Use of any -of this software is governed by the terms of the license below: - -Stripper : debug information stripper Copyright (c) 2003 Kohsuke Kawaguchi All -rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -3. Neither the name of the copyright holders nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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. - - -%% The following software may be included in this product: libpng official PNG -reference library; Use of any of this software is governed by the terms of the -license below: - -This copy of the libpng notices is provided for your convenience. In case of -any discrepancy between this copy and the notices in the file png.h that is -included in the libpng distribution, the latter shall prevail. - -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: - -If you modify libpng you may insert additional notices immediately following -this sentence. - -libpng version 1.2.6, December 3, 2004, is Copyright (c) 2004 Glenn - Randers-Pehrson, and is distributed according to the same disclaimer and - license as libpng-1.2.5with the following individual added to the list of - Contributing Authors Cosmin Truta - -libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are - Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are distributed according - to the same disclaimer and license as libpng-1.0.6 with the following - individuals added to the list of Contributing Authors Simon-Pierre Cadieux - Eric S. Raymond Gilles Vollant - -and with the following additions to the disclaimer: - -There is no warranty against interference with your enjoyment of the library or -against infringement. There is no warranty that our efforts or the library will -fulfill any of your particular purposes or needs. This library is provided with -all faults, and the entire risk of satisfactory quality, performance, accuracy, -and effort is with the user. - -libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are Copyright - (c) 1998, 1999 Glenn Randers-Pehrson, and are distributed according to the - same disclaimer and license as libpng-0.96,with the following individuals - added to the list of Contributing Authors: Tom Lane Glenn Randers-Pehrson - Willem van Schaik - -libpng versions 0.89, June 1996, through 0.96, May 1997, are Copyright (c) 1996, -1997 Andreas Dilger Distributed according to the same disclaimer and license as -libpng-0.88, with the following individuals added to the list of Contributing -Authors: John Bowler Kevin Bracey Sam Bushell Magnus Holmgren Greg Roelofs Tom -Tanner - -libpng versions 0.5, May 1995, through 0.88, January 1996, are Copyright (c) -1995, 1996 Guy Eric Schalnat, Group 42, Inc. - -For the purposes of this copyright and license, "Contributing Authors"is defined -as the following set of individuals: - - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -The PNG Reference Library is supplied "AS IS". The Contributing Authors and -Group 42, Inc. disclaim all warranties, expressed or implied, including, -without limitation, the warranties of merchantability and of fitness for any -purpose. The Contributing Authors and Group 42, Inc. assume no liability for -direct, indirect, incidental, special, exemplary,or consequential damages, which -may result from the use of the PNG Reference Library, even if advised of the -possibility of such damage. - -Permission is hereby granted to use, copy, modify, and distribute this source -code, or portions hereof, for any purpose, without fee, subject to the following -restrictions: - -1. The origin of this source code must not be misrepresented. - -2. Altered versions must be plainly marked as such and must not be -misrepresented as being the original source. - -3. This Copyright notice may not be removed or altered from any source or -altered source distribution. - -The Contributing Authors and Group 42, Inc. specifically permit, without fee, -and encourage the use of this source code as a component to supporting the PNG -file format in commercial products. If you use this source code in a product, -acknowledgment is not required but would be appreciated. - - -A "png_get_copyright" function is available, for convenient use in "about"boxes -and the like: - - printf("%s",png_get_copyright(NULL)); - -Also, the PNG logo (in PNG format, of course) is supplied in the files -"pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). - -Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a -certification mark of the Open Source Initiative. - -Glenn Randers-Pehrson -glennrp at users.sourceforge.net -December 3, 2004 - -%% The following software may be included in this product: Libungif - An -uncompressed GIF library; Use of any of this software is governed by the terms -of the license below: -The GIFLIB distribution is Copyright (c) 1997 Eric S.Raymond - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO -EVENT SHALL THEAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHERLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM,OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -INTHE SOFTWARE. - - -%% The following software may be included in this product: Ant; Use of any of -this software is governed by the terms of the license below: License The Apache -Software License Version 2.0 - -The Apache Software License Version 2.0 applies to all releases of Ant starting -with ant 1.6.1 - -/* - * Apache License - * Version 2.0, January 2004 - * http://www.apache.org/licenses/ - * - * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - * - * 1. Definitions. - * - * "License" shall mean the terms and conditions for use, reproduction, - * and distribution as defined by Sections 1 through 9 of this document. - * - * "Licensor" shall mean the copyright owner or entity authorized by - * the copyright owner that is granting the License. - * - * "Legal Entity" shall mean the union of the acting entity and all - * other entities that control, are controlled by, or are under common - * control with that entity. For the purposes of this definition, - * "control" means (i) the power, direct or indirect, to cause the - * direction or management of such entity, whether by contract or - * otherwise, or (ii) ownership of fifty percent (50%) or more of the - * outstanding shares, or (iii) beneficial ownership of such entity. - * - * "You" (or "Your") shall mean an individual or Legal Entity - * exercising permissions granted by this License. - * - * "Source" form shall mean the preferred form for making modifications, - * including but not limited to software source code, documentation - * source, and configuration files. - * - * "Object" form shall mean any form resulting from mechanical - * transformation or translation of a Source form, including but - * not limited to compiled object code, generated documentation, - * and conversions to other media types. - * - * "Work" shall mean the work of authorship, whether in Source or - * Object form, made available under the License, as indicated by a - * copyright notice that is included in or attached to the work - * (an example is provided in the Appendix below). - * - * "Derivative Works" shall mean any work, whether in Source or Object - * form, that is based on (or derived from) the Work and for which the - * editorial revisions, annotations, elaborations, or other modifications - * represent, as a whole, an original work of authorship. For the purposes - * of this License, Derivative Works shall not include works that remain - * separable from, or merely link (or bind by name) to the interfaces of, - * the Work and Derivative Works thereof. - * - * "Contribution" shall mean any work of authorship, including - * the original version of the Work and any modifications or additions - * to that Work or Derivative Works thereof, that is intentionally - * submitted to Licensor for inclusion in the Work by the copyright owner - * or by an individual or Legal Entity authorized to submit on behalf of - * the copyright owner. For the purposes of this definition, "submitted" - * means any form of electronic, verbal, or written communication sent - * to the Licensor or its representatives, including but not limited to - * communication on electronic mailing lists, source code control systems, - * and issue tracking systems that are managed by, or on behalf of, the - * Licensor for the purpose of discussing and improving the Work, but - * excluding communication that is conspicuously marked or otherwise - * designated in writing by the copyright owner as "Not a Contribution." - * - * "Contributor" shall mean Licensor and any individual or Legal Entity - * on behalf of whom a Contribution has been received by Licensor and - * subsequently incorporated within the Work. - * - * 2. Grant of Copyright License. Subject to the terms and conditions of - * this License, each Contributor hereby grants to You a perpetual, - * worldwide, non-exclusive, no-charge, royalty-free, irrevocable - * copyright license to reproduce, prepare Derivative Works of, - * publicly display, publicly perform, sublicense, and distribute the - * Work and such Derivative Works in Source or Object form. - * - * 3. Grant of Patent License. Subject to the terms and conditions of - * this License, each Contributor hereby grants to You a perpetual, - * worldwide, non-exclusive, no-charge, royalty-free, irrevocable - * (except as stated in this section) patent license to make, have made, - * use, offer to sell, sell, import, and otherwise transfer the Work, - * where such license applies only to those patent claims licensable - * by such Contributor that are necessarily infringed by their - * Contribution(s) alone or by combination of their Contribution(s) - * with the Work to which such Contribution(s) was submitted. If You - * institute patent litigation against any entity (including a - * cross-claim or counterclaim in a lawsuit) alleging that the Work - * or a Contribution incorporated within the Work constitutes direct - * or contributory patent infringement, then any patent licenses - * granted to You under this License for that Work shall terminate - * as of the date such litigation is filed. - * - * 4. Redistribution. You may reproduce and distribute copies of the - * Work or Derivative Works thereof in any medium, with or without - * modifications, and in Source or Object form, provided that You - * meet the following conditions: - * - * (a) You must give any other recipients of the Work or - * Derivative Works a copy of this License; and - * - * (b) You must cause any modified files to carry prominent notices - * stating that You changed the files; and - * - * (c) You must retain, in the Source form of any Derivative Works - * that You distribute, all copyright, patent, trademark, and - * attribution notices from the Source form of the Work, - * excluding those notices that do not pertain to any part of - * the Derivative Works; and - * - * (d) If the Work includes a "NOTICE" text file as part of its - * distribution, then any Derivative Works that You distribute must - * include a readable copy of the attribution notices contained - * within such NOTICE file, excluding those notices that do not - * pertain to any part of the Derivative Works, in at least one - * of the following places: within a NOTICE text file distributed - * as part of the Derivative Works; within the Source form or - * documentation, if provided along with the Derivative Works; or, - * within a display generated by the Derivative Works, if and - * wherever such third-party notices normally appear. The contents - * of the NOTICE file are for informational purposes only and - * do not modify the License. You may add Your own attribution - * notices within Derivative Works that You distribute, alongside - * or as an addendum to the NOTICE text from the Work, provided - * that such additional attribution notices cannot be construed - * as modifying the License. - * - * You may add Your own copyright statement to Your modifications and - * may provide additional or different license terms and conditions - * for use, reproduction, or distribution of Your modifications, or - * for any such Derivative Works as a whole, provided Your use, - * reproduction, and distribution of the Work otherwise complies with - * the conditions stated in this License. - * - * 5. Submission of Contributions. Unless You explicitly state otherwise, - * any Contribution intentionally submitted for inclusion in the Work - * by You to the Licensor shall be under the terms and conditions of - * this License, without any additional terms or conditions. - * Notwithstanding the above, nothing herein shall supersede or modify - * the terms of any separate license agreement you may have executed - * with Licensor regarding such Contributions. - * - * 6. Trademarks. This License does not grant permission to use the trade - * names, trademarks, service marks, or product names of the Licensor, - * except as required for reasonable and customary use in describing the - * origin of the Work and reproducing the content of the NOTICE file. - * - * 7. Disclaimer of Warranty. Unless required by applicable law or - * agreed to in writing, Licensor provides the Work (and each - * Contributor provides its Contributions) on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied, including, without limitation, any warranties or conditions - * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - * PARTICULAR PURPOSE. You are solely responsible for determining the - * appropriateness of using or redistributing the Work and assume any - * risks associated with Your exercise of permissions under this License. - * - * 8. Limitation of Liability. In no event and under no legal theory, - * whether in tort (including negligence), contract, or otherwise, - * unless required by applicable law (such as deliberate and grossly - * negligent acts) or agreed to in writing, shall any Contributor be - * liable to You for damages, including any direct, indirect, special, - * incidental, or consequential damages of any character arising as a - * result of this License or out of the use or inability to use the - * Work (including but not limited to damages for loss of goodwill, - * work stoppage, computer failure or malfunction, or any and all - * other commercial damages or losses), even if such Contributor - * has been advised of the possibility of such damages. - * - * 9. Accepting Warranty or Additional Liability. While redistributing - * the Work or Derivative Works thereof, You may choose to offer, - * and charge a fee for, acceptance of support, warranty, indemnity, - * or other liability obligations and/or rights consistent with this - * License. However, in accepting such obligations, You may act only - * on Your own behalf and on Your sole responsibility, not on behalf - * of any other Contributor, and only if You agree to indemnify, - * defend, and hold each Contributor harmless for any liability - * incurred by, or claims asserted against, such Contributor by reason - * of your accepting any such warranty or additional liability. - * - * END OF TERMS AND CONDITIONS - * - * APPENDIX: How to apply the Apache License to your work. - * - * To apply the Apache License to your work, attach the following - * boilerplate notice, with the fields enclosed by brackets "[]" - * replaced with your own identifying information. (Don't include - * the brackets!) The text should be enclosed in the appropriate - * comment syntax for the file format. We also recommend that a - * file or class name and description of purpose be included on the - * same "printed page" as the copyright notice for easier - * identification within third-party archives. - * - * Copyright [yyyy] Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -You can download the original license file here. - -The License is accompanied by a NOTICE - - ========================================================================= - == NOTICE file corresponding to the section 4 d of == - == the Apache License, Version 2.0, == - == in this case for the Apache Ant distribution. == - ========================================================================= - This product includes software developed by - The Apache Software Foundation (http://www.apache.org/). - -This product includes also software developed by : - the W3C consortium - (http://www.w3c.org) , - the SAX project (http://www.saxproject.org) - -Please read the different LICENSE files present in the root directory of this -distribution. - -The names "Ant" and "Apache Software Foundation" must not be used to endorse or -promote products derived from this software without prior written permission. -For written permission, please contact apache@apache.org. - -The Apache Software License, Version 1.1 - -The Apache Software License, Version 1.1, applies to all versions of up to -ant1.6.0 included. - -/* - * ============================================================================ - * The Apache Software License, Version 1.1 - * ============================================================================ - * - * Copyright (C) 2000-2003 The Apache Software Foundation. All - * rights reserved. - * - * Redistribution and use in source and binary forms, with or without modifica- - * tion, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The end-user documentation included with the redistribution, if any, must - * include the following acknowledgment: "This product includes software - * developed by the Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, if - * and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Ant" and "Apache Software Foundation" must not be used to - * endorse or promote products derived from this software without prior - * written permission. For written permission, please contact - * apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", nor may - * "Apache" appear in their name, without prior written permission of the - * Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 - * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - * DING, 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 software consists of voluntary contributions made by many individuals - * on behalf of the Apache Software Foundation. For more information on the - * Apache Software Foundation, please see http://www.apache.org. - * - */ - - -%% The following software may be included in this product: XML Resolver -library; Use of any of this software is governed by the terms of the license -below: - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by the - copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all other - entities that control, are controlled by, or are under common control - with that entity. For the purposes of this definition, "control" means - (i) the power, direct or indirect, to cause the direction or management - of such entity, whether by contract or otherwise, or (ii) ownership of - fifty percent (50%) or more of the outstanding shares, or - (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity exercising - permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation source, - and configuration files. - - "Object" form shall mean any form resulting from mechanical transformation - or translation of a Source form, including but not limited to compiled - object code, generated documentation, and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or Object - form, made available under the License, as indicated by a copyright - notice that is included in or attached to the work (an example is - provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces - of, the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including the original - version of the Work and any modifications or additions to that Work or - Derivative Works thereof, that is intentionally submitted to Licensor - for inclusion in the Work by the copyright owner or by an individual - or Legal Entity authorized to submit on behalf of the copyright owner. - For the purposes of this definition, "submitted" means any form of - electronic, verbal, or written communication sent to the Licensor or - its representatives, including but not limited to communication on - electronic mailing lists, source code control systems, and issue - tracking systems that are managed by, or on behalf of, the Licensor - for the purpose of discussing and improving the Work, but excluding - communication that is conspicuously marked or otherwise designated - in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, sublicense, and distribute the Work and such - Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of this - License, each Contributor hereby grants to You a perpetual, worldwide, - non-exclusive, no-charge, royalty-free, irrevocable (except as stated - in this section) patent license to make, have made, use, offer to sell, - sell, import, and otherwise transfer the Work, where such license - applies only to those patent claims licensable by such Contributor - that are necessarily infringed by their Contribution(s) alone or by - combination of their Contribution(s) with the Work to which such - Contribution(s) was submitted. If You institute patent litigation - against any entity (including a cross-claim or counterclaim in a - lawsuit) alleging that the Work or a Contribution incorporated within - the Work constitutes direct or contributory patent infringement, then - any patent licenses granted to You under this License for that Work - shall terminate as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the Work - or Derivative Works thereof in any medium, with or without modifications, - and in Source or Object form, provided that You meet the following - conditions: - - (a) You must give any other recipients of the Work or Derivative Works - a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works that - You distribute, all copyright, patent, trademark, and attribution notices - from the Source form of the Work, excluding those notices that do not - pertain to any part of the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its distribution, - then any Derivative Works that You distribute must include a readable copy - of the attribution notices contained within such NOTICE file, excluding - those notices that do not pertain to any part of the Derivative Works, in - at least one of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or documentation, - if provided along with the Derivative Works; or, within a display generated - by the Derivative Works, if and wherever such third-party notices normally - appear. The contents of the NOTICE file are for informational purposes only - and do not modify the License. You may add Your own attribution notices - within Derivative Works that You distribute, alongside or as an addendum to - the NOTICE text from the Work, provided that such additional attribution - notices cannot be construed as modifying the License. - - You may add Your own copyright statement to Your modifications and may provide - additional or different license terms and conditions for use, reproduction, - or distribution of Your modifications, or for any such Derivative Works as a - whole, provided Your use, reproduction, and distribution of the Work otherwise - complies with the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, any - Contribution intentionally submitted for inclusion in the Work by You to - the Licensor shall be under the terms and conditions of this License, without - any additional terms or conditions. Notwithstanding the above, nothing herein - shall supersede or modify the terms of any separate license agreement you may - have executed with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade names, - trademarks, service marks, or product names of the Licensor, except as required - for reasonable and customary use in describing the origin of the Work and - reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in - writing, Licensor provides the Work (and each Contributor provides its - Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF - ANY KIND, either express or implied, including, without limitation, any - warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or - FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining - the appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, whether - in tort (including negligence), contract, or otherwise, unless required by - applicable law (such as deliberate and grossly negligent acts) or agreed to - in writing, shall any Contributor be liable to You for damages, including - any direct, indirect, special, incidental, or consequential damages of any - character arising as a result of this License or out of the use or inability - to use the Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all other - commercial damages or losses), even if such Contributor has been advised - of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing the Work - or Derivative Works thereof, You may choose to offer, and charge a fee for, - acceptance of support, warranty, indemnity, or other liability obligations - and/or rights consistent with this License. However, in accepting such - obligations, You may act only on Your own behalf and on Your sole - responsibility, not on behalf of any other Contributor, and only if You - agree to indemnify, defend, and hold each Contributor harmless for any - liability incurred by, or claims asserted against, such Contributor by - reason of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following boilerplate notice, - with the fields enclosed by brackets "[]" replaced with your own identifying - information. (Don't include the brackets!) The text should be enclosed in the - appropriate comment syntax for the file format. We also recommend that a file - or class name and description of purpose be included on the same "printed page" - as the copyright notice for easier identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of the - License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software distributed - under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for the - specific language governing permissions and limitations under the License. - - -%% The following software may be included in this product: ICU4J; Use of any of -this software is governed by the terms of the license below: - -ICU License - ICU 1.8.1 and later COPYRIGHT AND PERMISSION NOTICE Copyright (c) - -1995-2003 International Business Machines Corporation and others All rights - reserved Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the "Software"), to - deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, and/or sell copies of - the Software, and to permit persons to whom the Software is furnished to do - so,provided that the above copyright notice(s) and this permission notice - appear in all copies of the Software and that both the above copyright - notice(s) and this permission notice appear in supporting documentation. THE - SOFTWARE IS PROVIDED"AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - INCLUDING BUT NOTLIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - PARTICULAR PURPOSEAND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL - THE COPYRIGHTHOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, - OR ANYSPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER - RESULTINGFROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - NEGLIGENCEOR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE - USE ORPERFORMANCE OF THIS SOFTWARE. Except as contained in this notice, the - name of a copyright holder shall not be used in advertising or otherwise to - promote the sale, use or other dealings in this Software without prior written - authorization of the copyright holder. - - -%% The following software may be included in this product: NekoHTML; Use of any -of this software is governed by the terms of the license below: The CyberNeko -Software License, Version 1.0 - - -(C) Copyright 2002,2003, Andy Clark. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - -3. The end-user documentation included with the redistribution, - if any, must include the following acknowledgment: - "This product includes software developed by Andy Clark." - Alternately, this acknowledgment may appear in the software itself, - if and wherever such third-party acknowledgments normally appear. - -4. The names "CyberNeko" and "NekoHTML" must not be used to endorse - or promote products derived from this software without prior - written permission. For written permission, please contact - andy@cyberneko.net. - -5. Products derived from this software may not be called "CyberNeko", - nor may "CyberNeko" appear in their name, without prior written - permission of the author. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 -OR OTHER CONTRIBUTORS 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 license is based on the Apache Software License, version 1.1 - - -%% The following software may be included in this product: Jing; Use of any of -this software is governed by the terms of the license below: Jing Copying -Conditions - -Copyright (c) 2001-2003 Thai Open Source Software Center Ltd All rights -reserved. - -Redistribution and use in source and binary forms, with or without -modification,are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice,this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Thai Open Source Software Center Ltd nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -ANDANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIEDWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -AREDISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR -ANYDIRECT, 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 ONANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THISSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -%% The following software may be included in this product: RelaxNGCC; Use of -any of this software is governed by the terms of the license below: - -Copyright (c) 2000-2003 Daisuke Okajima and Kohsuke Kawaguchi. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. - -3. The end-user documentation included with the redistribution, if -any, must include the following acknowledgment: - - "This product includes software developed by Daisuke Okajima - and Kohsuke Kawaguchi (http://relaxngcc.sf.net/)." - -Alternately, this acknowledgment may appear in the software itself, -if and wherever such third-party acknowledgments normally appear. - -4. The names of the copyright holders must not be used to endorse or -promote products derived from this software without prior written -permission. For written permission, please contact the copyright -holders. - -5. Products derived from this software may not be called "RELAXNGCC", -nor may "RELAXNGCC" appear in their name, without prior written -permission of the copyright holders. - -THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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 APACHE -SOFTWARE FOUNDATION OR ITS CONTRIBUTORS 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. - -%% The following software may be included in this product: RELAX NG Object -Model/Parser; Use of any of this software is governed by the terms of the -license below: The MIT License - -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do -so,subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESSFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS ORCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHERIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR -INCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -%% The following software may be included in this product: XFree86-VidMode -Extension; Use of any of this software is governed by the terms of the license -below: Version 1.1 of Project Licence. - - Copyright (C) 1994-2004 The Project, Inc. All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicence, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do -so,subject to the following conditions: - -1. Redistributions of source code must retain the above copyright notice,this -list of conditions, and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution, and in the same place and form -as other copyright, license and disclaimer information. - -3. The end-user documentation included with the redistribution, if any,must -include the following acknowledgment: "This product includes software developed -by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors", in -the same place and form as other third-party acknowledgments. Alternately, this -acknowledgment may appear in the software itself, in the same form and location -as other such third-party acknowledgments. - -4. Except as contained in this notice, the name of The XFree86 Project,Inc -shall not be used in advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization from TheXFree86 -Project, Inc. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -WARRANTIES,INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY ANDFITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -SHALL THE XFREE86PROJECT, INC OR ITS CONTRIBUTORS 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; ORBUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER INCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISINGIN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITYOF SUCH DAMAGE. - - -%% The following software may be included in this product: RelaxNGCC; Use of -any of this software is governed by the terms of the license below: This is -version 2003-May-08 of the Info-ZIP copyright and license. The definitive -version of this document should be available at -ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely. - - -Copyright (c) 1990-2003 Info-ZIP. All rights reserved. - -For the purposes of this copyright and license, "Info-ZIP" is defined asthe -following set of individuals: - - Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois, Jean-loup - Gailly, Hunter Goatley, Ian Gorman, Chris Herborth, Dirk Haase, Greg Hartwig, - Robert Heath, Jonathan Hudson, Paul Kienitz, David Kirschbaum, Johnny Lee, - Onno van der Linden, Igor Mandrichenko, Steve P. Miller, Sergio Monesi, - Keith Owens, George Petrov, Greg Roelofs, Kai Uwe Rommel, Steve Salisbury, - Dave Smith, Christian Spieler, Antoine Verheijen, Paul von Behren, Rich - Wales, Mike White - -This software is provided "as is," without warranty of any kind, express or -implied. In no event shall Info-ZIP or its contributors be held liable for any -direct, indirect, incidental, special or consequential damages arising out of -the use of or inability to use this software. - -Permission is granted to anyone to use this software for any purpose, including -commercial applications, and to alter it and redistribute it freely, subject to -the following restrictions: - -1. Redistributions of source code must retain the above copyright notice, -definition, disclaimer, and this list of conditions. - -2. Redistributions in binary form (compiled executables) must reproduce the -above copyright notice, definition, disclaimer, and this list of conditions in -documentation and/or other materials provided with the distribution. The sole -exception to this condition is redistribution of a standard UnZipSFX binary -(including SFXWiz) as part of a self-extracting archive; that is permitted -without inclusion of this license, as long as the normal SFX banner has not been -removed from the binary or disabled. - -3. Altered versions--including, but not limited to, ports to new operating -systems, existing ports with new graphical interfaces, and dynamic, shared, or -static library versions--must be plainly marked as such and must not be -misrepresented as being the original source. Such altered versions also must -not be misrepresented as being Info-ZIP releases--including, but not limited to, -labeling of the altered versions with the names "Info-ZIP" (or any variation -thereof, including, but not limited to, different capitalizations), "Pocket -UnZip," "WiZ" or "MacZip" without the explicit permission of Info-ZIP. Such -altered versions are further prohibited from misrepresentative use of the -Zip-Bugs or Info-ZIP e-mail addresses or of the Info-ZIP URL(s). - -4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip," -"UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its own source -and binary releases. - - -%% The following software may be included in this product: XML Security; Use of - any of this software is governed by the terms of the license below: The - Apache Software License, Version 1.1 PDF - -Copyright (C) 2002 The Apache Software Foundation. - -All rights reserved. Redistribution and use in source and binary forms, with or -without modifica- tion, are permitted provided that the following conditions are -met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -3. The end-user documentation included with the redistribution, if any,must -include the following acknowledgment:"This product includes software developed -by the Apache Software Foundation (http://www.apache.org/)." Alternately, this -acknowledgment may appear in the software itself, if and wherever such -third-party acknowledgments normally appear. - -4. The names"Apache Forrest" and "Apache Software Foundation" must not be used -to endorse or promote products derived from this software without prior written -permission. For written permission,please contact apache@apache.org. 5. -Products derived from this software may not be called "Apache", normay "Apache" -appear in their name, without prior written permission of the Apache Software -Foundation. THIS SOFTWARE IS PROVIDED``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY -DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ORSERVICES; LOSS -OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANYTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICTLIABILITY, 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 software consists of -voluntary contributions made by many individuals on behalf of the Apache -Software Foundation. For more information on the Apache Software Foundation, -please see http://www.apache.org. - - -%% The following software may be included in this product: Regexp, Regular -Expression Package v. 1.2; Use of any of this software is governed by the terms -of the license below: The Apache Software License, Version 1.1 Copyright (c) -2001 The Apache Software Foundation. All rights reserved. Redistribution and -use in source and binary forms, with or without modification,are permitted -provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -3. The end-user documentation included with the redistribution, if any, must -include the following acknowledgment: "This product includes software developed -by the Apache Software Foundation (http://www.apache.org/)." Alternately, this -acknowledgment may appear in the software itself, if and wherever such -third-party acknowledgments normally appear. - -4. The names "Apache" and "Apache Software Foundation" and "Apache Turbine" -must not be used to endorse or promote products derived from this software -without prior written permission. For written permission, please contact -apache@apache.org. - -5. Products derived from this software may not be called "Apache", "Apache -Turbine", nor may "Apache" appear in their name, without prior written -permission of the Apache Software Foundation. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE -SOFTWARE FOUNDATION OR ITS CONTRIBUTORS 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 software consists of voluntary contributions made by many individuals on -behalf of the Apache Software Foundation. For more information on the Apache -Software Foundation, please see http://www.apache.org. - -======================================================================== - - -%% The following software may be included in this product: zlib; Use of any of -this software is governed by the terms of the license below: - -zlib.h -- interface of the 'zlib' general purpose compression library - version 1.1.3, July 9th, 1998 - - Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup@gzip.org madler@alumni.caltech.edu - - - The data format used by the zlib library is described by RFCs (Request for - Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt - (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format - - -%% The following software may be included in this product: Mozilla Rhino. Use -of any of this software is governed by the terms of the license below: - - * The contents of this file are subject to the Netscape Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Rhino code, released - * May 6, 1999. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1997-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Kemal Bayram - * Patrick Beard - * Norris Boyd - * Igor Bukanov, igor@mir2.org - * Brendan Eich - * Ethan Hugg - * Roger Lawrence - * Terry Lucas - * Mike McCabe - * Milen Nankov - * Attila Szegedi, szegedia@freemail.hu - * Ian D. Stewart - * Andi Vajda - * Andrew Wason - */ - -%% The following software may be included in this product: Apache Derby. Use -of any of this software is governed by the terms of the license below: - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - -%% The following software may be included in this product: 7-Zip. Use of any -of this software is governed by the terms of the license below: - - ~~~~~ - License for use and distribution - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - 7-Zip Copyright (C) 1999-2007 Igor Pavlov. - - Licenses for files are: - - 1) 7z.dll: GNU LGPL + AES code license + unRAR restriction - 2) 7za.exe, 7z.sfx and 7zCon.sfx: GNU LGPL + AES code license - 3) All other files: GNU LGPL - - The GNU LGPL + AES code license + unRAR restriction means that you must follow - GNU LGPL rules, AES code license rules and unRAR restriction rules. - - The GNU LGPL + AES code license means that you must follow both GNU LGPL rules - and AES code license rules. - - - Note: - You can use 7-Zip on any computer, including a computer in a commercial - organization. You don't need to register or pay for 7-Zip. - - - GNU LGPL information - -------------------- - -GNU Lesser General Public License - -Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - [This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public Licenses are intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. - -This license, the Lesser General Public License, applies to some specially -designated software packages--typically libraries--of the Free Software -Foundation and other authors who decide to use it. You can use it too, but we -suggest you first think carefully about whether this license or the ordinary -General Public License is the better strategy to use in any particular case, -based on the explanations below. - -When we speak of free software, we are referring to freedom of use, not price. -Our General Public Licenses are designed to make sure that you have the freedom -to distribute copies of free software (and charge for this service if you wish); -that you receive source code or can get it if you want it; that you can change -the software and use pieces of it in new free programs; and that you are -informed that you can do these things. - -To protect your rights, we need to make restrictions that forbid distributors to -deny you these rights or to ask you to surrender these rights. These -restrictions translate to certain responsibilities for you if you distribute -copies of the library or if you modify it. - -For example, if you distribute copies of the library, whether gratis or for a -fee, you must give the recipients all the rights that we gave you. You must -make sure that they, too, receive or can get the source code. If you link other -code with the library, you must provide complete object files to the recipients, -so that they can relink them with the library after making changes to the -library and recompiling it. And you must show them these terms so they know -their rights. - -We protect your rights with a two-step method: (1) we copyright the library, -and (2) we offer you this license, which gives you legal permission to copy, -distribute and/or modify the library. - -To protect each distributor, we want to make it very clear that there is no -warranty for the free library. Also, if the library is modified by someone else -and passed on, the recipients should know that what they have is not the -original version, so that the original author's reputation will not be affected -by problems that might be introduced by others. - -Finally, software patents pose a constant threat to the existence of any free -program. We wish to make sure that a company cannot effectively restrict the -users of a free program by obtaining a restrictive license from a patent holder. -Therefore, we insist that any patent license obtained for a version of the -library must be consistent with the full freedom of use specified in this -license. - -Most GNU software, including some libraries, is covered by the ordinary GNU -General Public License. This license, the GNU Lesser General Public License, -applies to certain designated libraries, and is quite different from the -ordinary General Public License. We use this license for certain libraries in -order to permit linking those libraries into non-free programs. - -When a program is linked with a library, whether statically or using a shared -library, the combination of the two is legally speaking a combined work, a -derivative of the original library. The ordinary General Public License -therefore permits such linking only if the entire combination fits its criteria -of freedom. The Lesser General Public License permits more lax criteria for -linking other code with the library. - -We call this license the "Lesser" General Public License because it does Less to -protect the user's freedom than the ordinary General Public License. It also -provides other free software developers Less of an advantage over competing -non-free programs. These disadvantages are the reason we use the ordinary -General Public License for many libraries. However, the Lesser license provides -advantages in certain special circumstances. - -For example, on rare occasions, there may be a special need to encourage the -widest possible use of a certain library, so that it becomes a de-facto -standard. To achieve this, non-free programs must be allowed to use the -library. A more frequent case is that a free library does the same job as -widely used non-free libraries. In this case, there is little to gain by -limiting the free library to free software only, so we use the Lesser General -Public License. - -In other cases, permission to use a particular library in non-free programs -enables a greater number of people to use a large body of free software. For -example, permission to use the GNU C Library in non-free programs enables many -more people to use the whole GNU operating system, as well as its variant, the -GNU/Linux operating system. - -Although the Lesser General Public License is Less protective of the users' -freedom, it does ensure that the user of a program that is linked with the -Library has the freedom and the wherewithal to run that program using a modified -version of the Library. - -The precise terms and conditions for copying, distribution and modification -follow. Pay close attention to the difference between a "work based on the -library" and a "work that uses the library". The former contains code derived -from the library, whereas the latter must be combined with the library in order -to run. TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License Agreement applies to any software library or other program -which contains a notice placed by the copyright holder or other authorized party -saying it may be distributed under the terms of this Lesser General Public -License (also called "this License"). Each licensee is addressed as "you". - -A "library" means a collection of software functions and/or data prepared so as -to be conveniently linked with application programs (which use some of those -functions and data) to form executables. - -The "Library", below, refers to any such software library or work which has been -distributed under these terms. A "work based on the Library" means either the -Library or any derivative work under copyright law: that is to say, a work -containing the Library or a portion of it, either verbatim or with modifications -and/or translated straightforwardly into another language. (Hereinafter, -translation is included without limitation in the term "modification".) - -"Source code" for a work means the preferred form of the work for making -modifications to it. For a library, complete source code means all the source -code for all modules it contains, plus any associated interface definition -files, plus the scripts used to control compilation and installation of the -library. - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running a program using -the Library is not restricted, and output from such a program is covered only if -its contents constitute a work based on the Library (independent of the use of -the Library in a tool for writing it). Whether that is true depends on what the -Library does and what the program that uses the Library does. - -1. You may copy and distribute verbatim copies of the Library's complete source -code as you receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice and -disclaimer of warranty; keep intact all the notices that refer to this License -and to the absence of any warranty; and distribute a copy of this License along -with the Library. - -You may charge a fee for the physical act of transferring a copy, and you may at -your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Library or any portion of it, thus -forming a work based on the Library, and copy and distribute such modifications -or work under the terms of Section 1 above, provided that you also meet all of -these conditions: - -a) The modified work must itself be a software library. - -b) You must cause the files modified to carry prominent notices stating that you -changed the files and the date of any change. - -c) You must cause the whole of the work to be licensed at no charge to all third -parties under the terms of this License. - -d) If a facility in the modified Library refers to a function or a table of data -to be supplied by an application program that uses the facility, other than as -an argument passed when the facility is invoked, then you must make a good faith -effort to ensure that, in the event an application does not supply such function -or table, the facility still operates, and performs whatever part of its purpose -remains meaningful. - -(For example, a function in a library to compute square roots has a purpose that -is entirely well-defined independent of the application. Therefore, Subsection -2d requires that any application-supplied function or table used by this -function must be optional: if the application does not supply it, the square -root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Library, and can be reasonably -considered independent and separate works in themselves, then this License, and -its terms, do not apply to those sections when you distribute them as separate -works. But when you distribute the same sections as part of a whole which is a -work based on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the entire whole, -and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your -rights to work written entirely by you; rather, the intent is to exercise the -right to control the distribution of derivative or collective works based on the -Library. - -In addition, mere aggregation of another work not based on the Library with the -Library (or with a work based on the Library) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may opt to apply the terms of the ordinary GNU General Public License -instead of this License to a given copy of the Library. To do this, you must -alter all the notices that refer to this License, so that they refer to the -ordinary GNU General Public License, version 2, instead of to this License. (If -a newer version than version 2 of the ordinary GNU General Public License has -appeared, then you can specify that version instead if you wish.) Do not make -any other change in these notices. - -Once this change is made in a given copy, it is irreversible for that copy, so -the ordinary GNU General Public License applies to all subsequent copies and -derivative works made from that copy. - -This option is useful when you wish to copy part of the code of the Library into -a program that is not a library. - -4. You may copy and distribute the Library (or a portion or derivative of it, -under Section 2) in object code or executable form under the terms of Sections 1 -and 2 above provided that you accompany it with the complete corresponding -machine-readable source code, which must be distributed under the terms of -Sections 1 and 2 above on a medium customarily used for software interchange. - -If distribution of object code is made by offering access to copy from a -designated place, then offering equivalent access to copy the source code from -the same place satisfies the requirement to distribute the source code, even -though third parties are not compelled to copy the source along with the object -code. - -5. A program that contains no derivative of any portion of the Library, but is -designed to work with the Library by being compiled or linked with it, is called -a "work that uses the Library". Such a work, in isolation, is not a derivative -work of the Library, and therefore falls outside the scope of this License. - -However, linking a "work that uses the Library" with the Library creates an -executable that is a derivative of the Library (because it contains portions of -the Library), rather than a "work that uses the library". The executable is -therefore covered by this License. Section 6 states terms for distribution of -such executables. - -When a "work that uses the Library" uses material from a header file that is -part of the Library, the object code for the work may be a derivative work of -the Library even though the source code is not. Whether this is true is -especially significant if the work can be linked without the Library, or if the -work is itself a library. The threshold for this to be true is not precisely -defined by law. - -If such an object file uses only numerical parameters, data structure layouts -and accessors, and small macros and small inline functions (ten lines or less in -length), then the use of the object file is unrestricted, regardless of whether -it is legally a derivative work. (Executables containing this object code plus -portions of the Library will still fall under Section 6.) - -Otherwise, if the work is a derivative of the Library, you may distribute the -object code for the work under the terms of Section 6. Any executables -containing that work also fall under Section 6, whether or not they are linked -directly with the Library itself. - -6. As an exception to the Sections above, you may also combine or link a "work -that uses the Library" with the Library to produce a work containing portions of -the Library, and distribute that work under terms of your choice, provided that -the terms permit modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - -You must give prominent notice with each copy of the work that the Library is -used in it and that the Library and its use are covered by this License. You -must supply a copy of this License. If the work during execution displays -copyright notices, you must include the copyright notice for the Library among -them, as well as a reference directing the user to the copy of this License. -Also, you must do one of these things: - -a) Accompany the work with the complete corresponding machine-readable source -code for the Library including whatever changes were used in the work (which -must be distributed under Sections 1 and 2 above); and, if the work is an -executable linked with the Library, with the complete machine-readable "work -that uses the Library", as object code and/or source code, so that the user can -modify the Library and then relink to produce a modified executable containing -the modified Library. (It is understood that the user who changes the contents -of definitions files in the Library will not necessarily be able to recompile -the application to use the modified definitions.) - -b) Use a suitable shared library mechanism for linking with the Library. A -suitable mechanism is one that (1) uses at run time a copy of the library -already present on the user's computer system, rather than copying library -functions into the executable, and (2) will operate properly with a modified -version of the library, if the user installs one, as long as the modified -version is interface-compatible with the version that the work was made with. - -c) Accompany the work with a written offer, valid for at least three years, to -give the same user the materials specified in Subsection 6a, above, for a charge -no more than the cost of performing this distribution. - -d) If distribution of the work is made by offering access to copy from a -designated place, offer equivalent access to copy the above specified materials -from the same place. - -e) Verify that the user has already received a copy of these materials or that -you have already sent this user a copy. - -For an executable, the required form of the "work that uses the Library" must -include any data and utility programs needed for reproducing the executable from -it. However, as a special exception, the materials to be distributed need not -include anything that is normally distributed (in either source or binary form) -with the major components (compiler, kernel, and so on) of the operating system -on which the executable runs, unless that component itself accompanies the -executable. - -It may happen that this requirement contradicts the license restrictions of -other proprietary libraries that do not normally accompany the operating system. -Such a contradiction means you cannot use both them and the Library together in -an executable that you distribute. - -7. You may place library facilities that are a work based on the Library -side-by-side in a single library together with other library facilities not -covered by this License, and distribute such a combined library, provided that -the separate distribution of the work based on the Library and of the other -library facilities is otherwise permitted, and provided that you do these two -things: - -a) Accompany the combined library with a copy of the same work based on the -Library, uncombined with any other library facilities. This must be distributed -under the terms of the Sections above. - -b) Give prominent notice with the combined library of the fact that part of it -is a work based on the Library, and explaining where to find the accompanying -uncombined form of the same work. - -8. You may not copy, modify, sublicense, link with, or distribute the Library -except as expressly provided under this License. Any attempt otherwise to copy, -modify, sublicense, link with, or distribute the Library is void, and will -automatically terminate your rights under this License. However, parties who -have received copies, or rights, from you under this License will not have their -licenses terminated so long as such parties remain in full compliance. - -9. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Library -or its derivative works. These actions are prohibited by law if you do not -accept this License. Therefore, by modifying or distributing the Library (or -any work based on the Library), you indicate your acceptance of this License to -do so, and all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - -10. Each time you redistribute the Library (or any work based on the Library), -the recipient automatically receives a license from the original licensor to -copy, distribute, link with or modify the Library subject to these terms and -conditions. You may not impose any further restrictions on the recipients' -exercise of the rights granted herein. You are not responsible for enforcing -compliance by third parties with this License. - -11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), conditions -are imposed on you (whether by court order, agreement or otherwise) that -contradict the conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as to satisfy -simultaneously your obligations under this License and any other pertinent -obligations, then as a consequence you may not distribute the Library at all. -For example, if a patent license would not permit royalty-free redistribution of -the Library by all those who receive copies directly or indirectly through you, -then the only way you could satisfy both it and this License would be to refrain -entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, and -the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or -other property right claims or to contest validity of any such claims; this -section has the sole purpose of protecting the integrity of the free software -distribution system which is implemented by public license practices. Many -people have made generous contributions to the wide range of software -distributed through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing to -distribute software through any other system and a licensee cannot impose that -choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -12. If the distribution and/or use of the Library is restricted in certain -countries either by patents or by copyrighted interfaces, the original copyright -holder who places the Library under this License may add an explicit -geographical distribution limitation excluding those countries, so that -distribution is permitted only in or among countries not thus excluded. In such -case, this License incorporates the limitation as if written in the body of this -License. - -13. The Free Software Foundation may publish revised and/or new versions of the -Lesser General Public License from time to time. Such new versions will be -similar in spirit to the present version, but may differ in detail to address -new problems or concerns. - -Each version is given a distinguishing version number. If the Library specifies -a version number of this License which applies to it and "any later version", -you have the option of following the terms and conditions either of that version -or of any later version published by the Free Software Foundation. If the -Library does not specify a license version number, you may choose any version -ever published by the Free Software Foundation. - -14. If you wish to incorporate parts of the Library into other free programs -whose distribution conditions are incompatible with these, write to the author -to ask for permission. For software which is copyrighted by the Free Software -Foundation, write to the Free Software Foundation; we sometimes make exceptions -for this. Our decision will be guided by the two goals of preserving the free -status of all derivatives of our free software and of promoting the sharing and -reuse of software generally. - -NO WARRANTY - -15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR -THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE -STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY -"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE -LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, -SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY -TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF -THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER -PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND -CONDITIONS - -How to Apply These Terms to Your New Libraries - -If you develop a new library, and you want it to be of the greatest possible use -to the public, we recommend making it free software that everyone can -redistribute and change. You can do so by permitting redistribution under these -terms (or, alternatively, under the terms of the ordinary General Public -License). - -To apply these terms, attach the following notices to the library. It is safest -to attach them to the start of each source file to most effectively convey the -exclusion of warranty; and each file should have at least the "copyright" line -and a pointer to where the full notice is found. - - <one line to give the library's name and an idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your school, -if any, to sign a "copyright disclaimer" for the library, if necessary. Here is -a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in - the library `Frob' (a library for tweaking knobs) written - by James Random Hacker. - - signature of Ty Coon, 1 April 1990 - - Ty Coon, President of Vice - -That's all there is to it! - - - unRAR restriction - ----------------- - - The unRAR sources cannot be used to re-create the RAR compression -algorithm, - which is proprietary. Distribution of modified unRAR sources in separate -form - or as a part of other software is permitted, provided that it is clearly - stated in the documentation and source comments that the code may - not be used to develop a RAR (WinRAR) compatible archiver. - - - AES code license - ---------------- - - Copyright (c) 2001, Dr Brian Gladman - - LICENSE TERMS - - The free distribution and use of this software in both source and binary - form is allowed (with or without changes) provided that: - - 1. distributions of this source code include the above copyright - notice, this list of conditions and the following disclaimer; - - 2. distributions in binary form include the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other associated materials; - - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. - - DISCLAIMER - - This software is provided 'as is' with no explicit or implied warranties - in respect of its properties, including, but not limited to, correctness - and fitness for purpose. - - -*************************************************************************** - -%%The following software may be included in this product: -UPX - -Use of any of this software is governed by the terms of the license below: - ------BEGIN PGP SIGNED MESSAGE----- - - - ooooo ooo ooooooooo. ooooooo ooooo - `888' `8' `888 `Y88. `8888 d8' - 888 8 888 .d88' Y888..8P - 888 8 888ooo88P' `8888' - 888 8 888 .8PY888. - `88. .8' 888 d8' `888b - `YbodP' o888o o888o o88888o - - - The Ultimate Packer for eXecutables - Copyright (c) 1996-2000 Markus Oberhumer & Laszlo Molnar - http://wildsau.idv.uni-linz.ac.at/mfx/upx.html - http://www.nexus.hu/upx - http://upx.tsx.org - - -PLEASE CAREFULLY READ THIS LICENSE AGREEMENT, ESPECIALLY IF YOU PLAN -TO MODIFY THE UPX SOURCE CODE OR USE A MODIFIED UPX VERSION. - - -ABSTRACT -======== - - UPX and UCL are copyrighted software distributed under the terms - of the GNU General Public License (hereinafter the "GPL"). - - The stub which is imbedded in each UPX compressed program is part - of UPX and UCL, and contains code that is under our copyright. The - terms of the GNU General Public License still apply as compressing - a program is a special form of linking with our stub. - - As a special exception we grant the free usage of UPX for all - executables, including commercial programs. - See below for details and restrictions. - - -COPYRIGHT -========= - - UPX and UCL are copyrighted software. All rights remain with the authors. - - UPX is Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer - UPX is Copyright (C) 1996-2000 Laszlo Molnar - - UCL is Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer - - -GNU GENERAL PUBLIC LICENSE -========================== - - UPX and the UCL library are free software; you can redistribute them - and/or modify them under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. - - UPX and UCL are distributed in the hope that they 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 for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. - - -SPECIAL EXCEPTION FOR COMPRESSED EXECUTABLES -============================================ - - The stub which is imbedded in each UPX compressed program is part - of UPX and UCL, and contains code that is under our copyright. The - terms of the GNU General Public License still apply as compressing - a program is a special form of linking with our stub. - - Hereby Markus F.X.J. Oberhumer and Laszlo Molnar grant you special - permission to freely use and distribute all UPX compressed programs - (including commercial ones), subject to the following restrictions: - - 1. You must compress your program with a completely unmodified UPX - version; either with our precompiled version, or (at your option) - with a self compiled version of the unmodified UPX sources as - distributed by us. - 2. This also implies that the UPX stub must be completely unmodfied, i.e. - the stub imbedded in your compressed program must be byte-identical - to the stub that is produced by the official unmodified UPX version. - 3. The decompressor and any other code from the stub must exclusively get - used by the unmodified UPX stub for decompressing your program at - program startup. No portion of the stub may get read, copied, - called or otherwise get used or accessed by your program. - - -ANNOTATIONS -=========== - - - You can use a modified UPX version or modified UPX stub only for - programs that are compatible with the GNU General Public License. - - - We grant you special permission to freely use and distribute all UPX - compressed programs. But any modification of the UPX stub (such as, - but not limited to, removing our copyright string or making your - program non-decompressible) will immediately revoke your right to - use and distribute a UPX compressed program. - - - UPX is not a software protection tool; by requiring that you use - the unmodified UPX version for your proprietary programs we - make sure that any user can decompress your program. This protects - both you and your users as nobody can hide malicious code - - any program that cannot be decompressed is highly suspicious - by definition. - - - You can integrate all or part of UPX and UCL into projects that - are compatible with the GNU GPL, but obviously you cannot grant - any special exceptions beyond the GPL for our code in your project. - - - We want to actively support manufacturers of virus scanners and - similar security software. Please contact us if you would like to - incorporate parts of UPX or UCL into such a product. - - - -Markus F.X.J. Oberhumer Laszlo Molnar -markus.oberhumer@jk.uni-linz.ac.at ml1050@cdata.tvnet.hu - -Linz, Austria, 25 Feb 2000 - -Additional License(s) - -The UPX license file is at http://upx.sourceforge.net/upx-license.html. - -*************************************************************************** - -%%The following software may be included in this product: -LZMA Software Development Kit - -Use of any of this software is governed by the terms of the license below: - -License - -LZMA SDK is available under any of the following licenses: - - 1. GNU Lesser General Public License (GNU LGPL) - 2. Common Public License (CPL) - 3. Simplified license for unmodified code (read SPECIAL EXCEPTION) - 4. Proprietary license - -This means that you can select one of these four options and follow rules of -that license. - -SPECIAL EXCEPTION: Igor Pavlov, as the author of this code, expressly permit -you statically or dynamically to link your code (or bind by name) to the files -from LZMA SDK without subjecting your linked code to the terms of the CPL or GNU -LGPL. Any modification or addition to any file in the LZMA SDK, however, is -subject to the GNU LGPL or CPL terms. - -This SPECIAL EXCEPTION allows you to use LZMA SDK in applications with -proprietary code, provided you keep the LZMA SDK code unmodified. - -SPECIAL EXCEPTION #2: Igor Pavlov, as the author of this code, expressly -permits you to use LZMA SDK 4.43 under the same terms and conditions contained -in the License Agreement you have for any previous version of LZMA SDK developed -by Igor Pavlov. - -SPECIAL EXCEPTION #2 allows holders of proprietary licenses to use latest -version of LZMA SDK as update for previous versions. - -GNU LGPL and CPL are pretty similar and both these licenses are classified as -free software licenses at http://www.gnu.org/ and OSI-approved at -http://www.opensource.org/. - -LZMA SDK also is available under a proprietary license which can include: - -1. The right to modify code from the LZMA SDK without subjecting the modified -code to the terms of the CPL or GNU LGPL - -2. Technical support for LZMA SDK via email - -To request such a proprietary license, or for any additional consultations, send -an email message, using the 7-Zip support page: Send message to LZMA developer - -The source code of 7-Zip is released under the terms of the GNU LGPL. You can -download the source code of 7-Zip at 7-Zip's Source Forge Page - -Additional License(s) - -The license included with the software differs slightly from the version posted -on the website. Specifically it includes SPECIAL EXCEPTION #3, which is not -present in the license on the website. The license from the software archive -follows: - -LICENSE -------- - -LZMA SDK is available under any of the following licenses: - -1) GNU Lesser General Public License (GNU LGPL) -2) Common Public License (CPL) -3) Simplified license for unmodified code (read SPECIAL EXCEPTION) -4) Proprietary license - -It means that you can select one of these four options and follow rules of that license. - - -1,2) GNU LGPL and CPL licenses are pretty similar and both these licenses are -classified as - - "Free software licenses" at http://www.gnu.org/ - - "OSI-approved" at http://www.opensource.org/ - - -3) SPECIAL EXCEPTION - -Igor Pavlov, as the author of this code, expressly permits you to statically or -dynamically link your code (or bind by name) to the files from LZMA SDK without -subjecting your linked code to the terms of the CPL or GNU LGPL. Any -modifications or additions to files from LZMA SDK, however, are subject to the -GNU LGPL or CPL terms. - -SPECIAL EXCEPTION allows you to use LZMA SDK in applications with closed code, -while you keep LZMA SDK code unmodified. - - -SPECIAL EXCEPTION #2: Igor Pavlov, as the author of this code, expressly -permits you to use this code under the same terms and conditions contained in -the License Agreement you have for any previous version of LZMA SDK developed by -Igor Pavlov. - -SPECIAL EXCEPTION #2 allows owners of proprietary licenses to use latest version -of LZMA SDK as update for previous versions. - - -SPECIAL EXCEPTION #3: Igor Pavlov, as the author of this code, expressly -permits you to use code of the following files: BranchTypes.h, LzmaTypes.h, -LzmaTest.c, LzmaStateTest.c, LzmaAlone.cpp, LzmaAlone.cs, LzmaAlone.java as -public domain code. - - -4) Proprietary license - -LZMA SDK also can be available under a proprietary license which -can include: - -1) Right to modify code without subjecting modified code to the terms of the CPL or GNU LGPL -2) Technical support for code - -To request such proprietary license or any additional consultations, send email -message from that page:http://www.7-zip.org/support.html - - -You should have received a copy of the GNU Lesser General Public License along -with this library; if not, write to the Free Software Foundation, Inc., 59 -Temple Place, Suite 330, Boston, MA 02111-1307 USA - -You should have received a copy of the Common Public License along with this -library. +Please refer to http://java.com/thirdpartylicense diff --git a/extra/source/jdk-6/jdk.SlackBuild b/extra/source/jdk-6/jdk.SlackBuild index 02eef970c..db589f7db 100755 --- 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 -DVER=1.6.0_20 +VERSION=6u25 +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} diff --git a/extra/source/jdk-6/register.html b/extra/source/jdk-6/register.html index 259a70fa7..b5411e14a 100644 --- 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"> </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> </td> <td><p class="style1">Thank you for installing the - <strong> Java Development Kit Version 6 Update 20 </strong> - from Sun Microsystems. </p> + <strong> Java Development Kit Version 6 Update 25 </strong> + 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"> - <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>"> + <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>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> </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 applications you access using your Sun Online Account, - and the products and systems you register with your Sun Online Account.</p> + and management of your Oracle.com account, the services + and applications you access using your Oracle.com account, + 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> </td> diff --git a/extra/source/jdk-6/register_ja.html b/extra/source/jdk-6/register_ja.html index 7030d6aca..330e84303 100644 --- 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"> </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> </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"> - <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>"> + <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>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> </td> <td bgcolor="#f1f7df"> - <p class="style3">Sun Microsystems, Inc. ã¯ã€ãŠå®¢æ§˜ã®ãƒ—ライãƒã‚·ãƒ¼ã‚’å°Šé‡ã—ã¾ã™ã€‚ ãŠå®¢æ§˜ã®å€‹äººæƒ…å ±ã¯ã€ãŠå®¢æ§˜ã® Sun オンラインアカウントã€ãŠå®¢æ§˜ãŒ Sun オンラインアカウントを使用ã—ã¦ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã‚µãƒ¼ãƒ“スã¨ã‚¢ãƒ—リケーションã€ãŠã‚ˆã³ãŠå®¢æ§˜ãŒ Sun オンラインアカウントã§ç™»éŒ²ã™ã‚‹è£½å“ã¨ã‚·ã‚¹ãƒ†ãƒ ã®é€šä¿¡ã¨ç®¡ç†ã«ä½¿ç”¨ã—ã¾ã™ã€‚</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">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> 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> </td> diff --git a/extra/source/jdk-6/register_zh_CN.html b/extra/source/jdk-6/register_zh_CN.html index 0656e82ed..d17e3535e 100644 --- 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"> </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> </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"> - <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>"> + <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>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> </td> <td bgcolor="#f1f7df"> - <p class="style3">Sun Microsystems, Inc. å°Šé‡æ‚¨çš„éšç§ã€‚我们会将您的个人信æ¯ç”¨äºŽé€šä¿¡å’Œ Sun è”机å¸æˆ·çš„管ç†ã€Sun è”机å¸æˆ·è®¿é—®çš„æœåŠ¡å’Œåº”用程åºä»¥åŠç”¨äºŽä½¿ç”¨ Sun è”机å¸æˆ·æ³¨å†Œçš„产å“和系统。</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">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>有关 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> </td> diff --git a/extra/source/jdk-6/slack-desc b/extra/source/jdk-6/slack-desc index 9dafa417c..57dfb7e0f 100644 --- 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: http://java.sun.com/ +jdk: For additional information, refer to this web page: +jdk: http://java.com/ jdk: jdk: jdk: diff --git a/extra/source/kde3-compat/arts/arts.SlackBuild b/extra/source/kde3-compat/arts/arts.SlackBuild deleted file mode 100755 index a617c18c5..000000000 --- a/extra/source/kde3-compat/arts/arts.SlackBuild +++ /dev/null @@ -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 - diff --git a/extra/source/kde3-compat/arts/arts.tmpdir.diff b/extra/source/kde3-compat/arts/arts.tmpdir.diff deleted file mode 100644 index f50472a1e..000000000 --- a/extra/source/kde3-compat/arts/arts.tmpdir.diff +++ /dev/null @@ -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))) - { diff --git a/extra/source/kde3-compat/k3b3/k3b3.SlackBuild b/extra/source/kde3-compat/k3b3/k3b3.SlackBuild deleted file mode 100755 index 186fbe7b9..000000000 --- a/extra/source/kde3-compat/k3b3/k3b3.SlackBuild +++ /dev/null @@ -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 - diff --git a/extra/source/kde3-compat/k3b3/slack-desc b/extra/source/kde3-compat/k3b3/slack-desc deleted file mode 100644 index 52856f6a3..000000000 --- a/extra/source/kde3-compat/k3b3/slack-desc +++ /dev/null @@ -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: diff --git a/extra/source/kde3-compat/kdelibs3/apply-patches.sh b/extra/source/kde3-compat/kdelibs3/apply-patches.sh deleted file mode 100644 index 68190b0b2..000000000 --- a/extra/source/kde3-compat/kdelibs3/apply-patches.sh +++ /dev/null @@ -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 diff --git a/extra/source/kde3-compat/kdelibs3/kdelibs-utempter.diff b/extra/source/kde3-compat/kdelibs3/kdelibs-utempter.diff deleted file mode 100644 index 4f7c8f3a0..000000000 --- a/extra/source/kde3-compat/kdelibs3/kdelibs-utempter.diff +++ /dev/null @@ -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(); diff --git a/extra/source/kde3-compat/kdelibs3/kdelibs.inotify.diff b/extra/source/kde3-compat/kdelibs3/kdelibs.inotify.diff deleted file mode 100644 index 791b5e683..000000000 --- a/extra/source/kde3-compat/kdelibs3/kdelibs.inotify.diff +++ /dev/null @@ -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) - { diff --git a/extra/source/kde3-compat/kdelibs3/kdelibs.no.inotify.externs.diff b/extra/source/kde3-compat/kdelibs3/kdelibs.no.inotify.externs.diff deleted file mode 100644 index ef06c1dce..000000000 --- a/extra/source/kde3-compat/kdelibs3/kdelibs.no.inotify.externs.diff +++ /dev/null @@ -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 diff --git a/extra/source/kde3-compat/kdelibs3/kdelibs3.SlackBuild b/extra/source/kde3-compat/kdelibs3/kdelibs3.SlackBuild deleted file mode 100755 index d197ea32f..000000000 --- a/extra/source/kde3-compat/kdelibs3/kdelibs3.SlackBuild +++ /dev/null @@ -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 - diff --git a/extra/source/kde3-compat/kdelibs3/local.options b/extra/source/kde3-compat/kdelibs3/local.options deleted file mode 100644 index 056703278..000000000 --- a/extra/source/kde3-compat/kdelibs3/local.options +++ /dev/null @@ -1,4 +0,0 @@ -VERSION=3.5.10 -ARCH=x86_64 -TARGET=x86_64 -BUILD=opt1 diff --git a/extra/source/kde3-compat/kdelibs3/slack-desc b/extra/source/kde3-compat/kdelibs3/slack-desc deleted file mode 100644 index b6e75d1d5..000000000 --- a/extra/source/kde3-compat/kdelibs3/slack-desc +++ /dev/null @@ -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: diff --git a/extra/source/kde3-compat/qt3/doinst.sh b/extra/source/kde3-compat/qt3/doinst.sh deleted file mode 100644 index d57fb0319..000000000 --- a/extra/source/kde3-compat/qt3/doinst.sh +++ /dev/null @@ -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 diff --git a/extra/source/kde3-compat/qt3/profile.d/qt.csh b/extra/source/kde3-compat/qt3/profile.d/qt.csh deleted file mode 100755 index 490877c4f..000000000 --- a/extra/source/kde3-compat/qt3/profile.d/qt.csh +++ /dev/null @@ -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 diff --git a/extra/source/kde3-compat/qt3/profile.d/qt.sh b/extra/source/kde3-compat/qt3/profile.d/qt.sh deleted file mode 100755 index c4e23bb59..000000000 --- a/extra/source/kde3-compat/qt3/profile.d/qt.sh +++ /dev/null @@ -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 diff --git a/extra/source/kde3-compat/qt3/qt-x11.diff b/extra/source/kde3-compat/qt3/qt-x11.diff deleted file mode 100644 index 74453f21f..000000000 --- a/extra/source/kde3-compat/qt3/qt-x11.diff +++ /dev/null @@ -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(); diff --git a/extra/source/kde3-compat/qt3/qt.mysql.h.diff b/extra/source/kde3-compat/qt3/qt.mysql.h.diff deleted file mode 100644 index 2d6fca5ac..000000000 --- a/extra/source/kde3-compat/qt3/qt.mysql.h.diff +++ /dev/null @@ -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 diff --git a/extra/source/kde3-compat/qt3/qt.x86.cflags.diff b/extra/source/kde3-compat/qt3/qt.x86.cflags.diff deleted file mode 100644 index 880037c23..000000000 --- a/extra/source/kde3-compat/qt3/qt.x86.cflags.diff +++ /dev/null @@ -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 diff --git a/extra/source/kde3-compat/qt3/qt3.SlackBuild b/extra/source/kde3-compat/qt3/qt3.SlackBuild deleted file mode 100755 index d32d283ea..000000000 --- a/extra/source/kde3-compat/qt3/qt3.SlackBuild +++ /dev/null @@ -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 - diff --git a/extra/source/kde3-compat/qt3/slack-desc b/extra/source/kde3-compat/qt3/slack-desc deleted file mode 100644 index dc7ea57e6..000000000 --- a/extra/source/kde3-compat/qt3/slack-desc +++ /dev/null @@ -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: diff --git a/extra/source/pam/make-pam-solibs-for-chrome.sh b/extra/source/pam/make-pam-solibs-for-chrome.sh new file mode 100755 index 000000000..e7cd4c9e6 --- /dev/null +++ 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 + diff --git a/extra/source/pam/pam.SlackBuild b/extra/source/pam/pam.SlackBuild new file mode 100755 index 000000000..bbea0617a --- /dev/null +++ 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 + diff --git a/extra/source/pam/patches/pam-1.0.90-redhat-modules.patch b/extra/source/pam/patches/pam-1.0.90-redhat-modules.patch new file mode 100644 index 000000000..3ad41ccc6 --- /dev/null +++ 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 \ diff --git a/extra/source/pam/patches/pam-1.0.91-std-noclose.patch b/extra/source/pam/patches/pam-1.0.91-std-noclose.patch new file mode 100644 index 000000000..735948490 --- /dev/null +++ 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); + } + } + diff --git a/extra/source/pam/patches/pam-1.1.0-notally.patch b/extra/source/pam/patches/pam-1.1.0-notally.patch new file mode 100644 index 000000000..9327eecba --- /dev/null +++ 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 + diff --git a/extra/source/pam/patches/pam-1.1.1-faillock.patch b/extra/source/pam/patches/pam-1.1.1-faillock.patch new file mode 100644 index 000000000..46f303741 --- /dev/null +++ b/extra/source/pam/patches/pam-1.1.1-faillock.patch @@ -0,0 +1,1712 @@ +diff -up Linux-PAM-1.1.1/configure.in.faillock Linux-PAM-1.1.1/configure.in +--- Linux-PAM-1.1.1/configure.in.faillock 2010-09-17 15:58:41.000000000 +0200 ++++ Linux-PAM-1.1.1/configure.in 2010-09-17 15:58:41.000000000 +0200 +@@ -539,7 +539,7 @@ AC_CONFIG_FILES([Makefile libpam/Makefil + modules/pam_access/Makefile modules/pam_cracklib/Makefile \ + modules/pam_debug/Makefile modules/pam_deny/Makefile \ + modules/pam_echo/Makefile modules/pam_env/Makefile \ +- modules/pam_faildelay/Makefile \ ++ modules/pam_faildelay/Makefile modules/pam_faillock/Makefile \ + modules/pam_filter/Makefile modules/pam_filter/upperLOWER/Makefile \ + modules/pam_ftp/Makefile modules/pam_group/Makefile \ + modules/pam_issue/Makefile modules/pam_keyinit/Makefile \ +diff -up Linux-PAM-1.1.1/doc/sag/pam_faillock.xml.faillock Linux-PAM-1.1.1/doc/sag/pam_faillock.xml +--- Linux-PAM-1.1.1/doc/sag/pam_faillock.xml.faillock 2010-09-17 16:05:56.000000000 +0200 ++++ Linux-PAM-1.1.1/doc/sag/pam_faillock.xml 2010-09-17 16:08:26.000000000 +0200 +@@ -0,0 +1,38 @@ ++<?xml version='1.0' encoding='UTF-8'?> ++<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" ++ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"> ++<section id='sag-pam_faillock'> ++ <title>pam_faillock - temporarily locking access based on failed authentication attempts during an interval</title> ++ <cmdsynopsis> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//cmdsynopsis[@id = "pam_faillock-cmdsynopsisauth"]/*)'/> ++ </cmdsynopsis> ++ <cmdsynopsis> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//cmdsynopsis[@id = "pam_faillock-cmdsynopsisacct"]/*)'/> ++ </cmdsynopsis> ++ <section id='sag-pam_faillock-description'> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-description"]/*)'/> ++ </section> ++ <section id='sag-pam_faillock-options'> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-options"]/*)'/> ++ </section> ++ <section id='sag-pam_faillock-types'> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-types"]/*)'/> ++ </section> ++ <section id='sag-pam_faillock-return_values'> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-return_values"]/*)'/> ++ </section> ++ <section id='sag-pam_faillock-examples'> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-examples"]/*)'/> ++ </section> ++ <section id='sag-pam_faillock-author'> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-author"]/*)'/> ++ </section> ++</section> +diff -up Linux-PAM-1.1.1/modules/Makefile.am.faillock Linux-PAM-1.1.1/modules/Makefile.am +--- Linux-PAM-1.1.1/modules/Makefile.am.faillock 2010-09-17 15:58:41.000000000 +0200 ++++ Linux-PAM-1.1.1/modules/Makefile.am 2010-09-17 15:58:41.000000000 +0200 +@@ -3,7 +3,7 @@ + # + + SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \ +- pam_chroot pam_console pam_postgresok \ ++ pam_chroot pam_console pam_postgresok pam_faillock \ + 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.1.1/modules/pam_faillock/faillock.c.faillock Linux-PAM-1.1.1/modules/pam_faillock/faillock.c +--- Linux-PAM-1.1.1/modules/pam_faillock/faillock.c.faillock 2010-09-17 15:58:41.000000000 +0200 ++++ Linux-PAM-1.1.1/modules/pam_faillock/faillock.c 2010-09-17 15:58:41.000000000 +0200 +@@ -0,0 +1,147 @@ ++/* ++ * Copyright (c) 2010 Tomas Mraz <tmraz@redhat.com> ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, and the entire permission notice in its entirety, ++ * including the disclaimer of warranties. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The name of the author may not be used to endorse or promote ++ * products derived from this software without specific prior ++ * written permission. ++ * ++ * ALTERNATIVELY, this product may be distributed under the terms of ++ * the GNU Public License, in which case the provisions of the GPL are ++ * required INSTEAD OF the above restrictions. (This clause is ++ * necessary due to a potential bad interaction between the GPL and ++ * the restrictions contained in a BSD-style copyright.) ++ * ++ * THIS SOFTWARE IS PROVIDED ``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. ++ */ ++ ++#include "config.h" ++#include <string.h> ++#include <stdlib.h> ++#include <unistd.h> ++#include <errno.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <sys/file.h> ++#include <fcntl.h> ++#include <security/pam_modutil.h> ++ ++#include "faillock.h" ++ ++int ++open_tally (const char *dir, const char *user, int create) ++{ ++ char *path; ++ int flags = O_RDWR; ++ int fd; ++ ++ if (strstr(user, "../") != NULL) ++ /* just a defensive programming as the user must be a ++ * valid user on the system anyway ++ */ ++ return -1; ++ path = malloc(strlen(dir) + strlen(user) + 2); ++ if (path == NULL) ++ return -1; ++ ++ strcpy(path, dir); ++ if (*dir && dir[strlen(dir) - 1] != '/') { ++ strcat(path, "/"); ++ } ++ strcat(path, user); ++ ++ if (create) { ++ flags |= O_CREAT; ++ } ++ ++ fd = open(path, flags, 0600); ++ ++ if (fd != -1) ++ while (flock(fd, LOCK_EX) == -1 && errno == EINTR); ++ ++ return fd; ++} ++ ++#define CHUNK_SIZE (64 * sizeof(struct tally)) ++#define MAX_RECORDS 1024 ++ ++int ++read_tally(int fd, struct tally_data *tallies) ++{ ++ void *data = NULL, *newdata; ++ unsigned int count = 0; ++ ssize_t chunk = 0; ++ ++ do { ++ newdata = realloc(data, count * sizeof(struct tally) + CHUNK_SIZE); ++ if (newdata == NULL) { ++ free(data); ++ return -1; ++ } ++ ++ data = newdata; ++ ++ chunk = pam_modutil_read(fd, (char *)data + count * sizeof(struct tally), CHUNK_SIZE); ++ if (chunk < 0) { ++ free(data); ++ return -1; ++ } ++ ++ count += chunk/sizeof(struct tally); ++ ++ if (count >= MAX_RECORDS) ++ break; ++ } ++ while (chunk == CHUNK_SIZE); ++ ++ tallies->records = data; ++ tallies->count = count; ++ ++ return 0; ++} ++ ++int ++update_tally(int fd, struct tally_data *tallies) ++{ ++ void *data = tallies->records; ++ unsigned int count = tallies->count; ++ ssize_t chunk; ++ ++ if (tallies->count > MAX_RECORDS) { ++ data = tallies->records + (count - MAX_RECORDS); ++ count = MAX_RECORDS; ++ } ++ ++ if (lseek(fd, 0, SEEK_SET) == (off_t)-1) { ++ return -1; ++ } ++ ++ chunk = pam_modutil_write(fd, data, count * sizeof(struct tally)); ++ ++ if (chunk != (ssize_t)(count * sizeof(struct tally))) { ++ return -1; ++ } ++ ++ if (ftruncate(fd, count * sizeof(struct tally)) == -1) ++ return -1; ++ ++ return 0; ++} +diff -up Linux-PAM-1.1.1/modules/pam_faillock/faillock.h.faillock Linux-PAM-1.1.1/modules/pam_faillock/faillock.h +--- Linux-PAM-1.1.1/modules/pam_faillock/faillock.h.faillock 2010-09-17 15:58:41.000000000 +0200 ++++ Linux-PAM-1.1.1/modules/pam_faillock/faillock.h 2010-09-17 15:58:41.000000000 +0200 +@@ -0,0 +1,72 @@ ++/* ++ * Copyright (c) 2010 Tomas Mraz <tmraz@redhat.com> ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, and the entire permission notice in its entirety, ++ * including the disclaimer of warranties. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The name of the author may not be used to endorse or promote ++ * products derived from this software without specific prior ++ * written permission. ++ * ++ * ALTERNATIVELY, this product may be distributed under the terms of ++ * the GNU Public License, in which case the provisions of the GPL are ++ * required INSTEAD OF the above restrictions. (This clause is ++ * necessary due to a potential bad interaction between the GPL and ++ * the restrictions contained in a BSD-style copyright.) ++ * ++ * THIS SOFTWARE IS PROVIDED ``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. ++ */ ++ ++/* ++ * faillock.h - authentication failure data file record structure ++ * ++ * Each record in the file represents an instance of login failure of ++ * the user at the recorded time ++ */ ++ ++ ++#ifndef _FAILLOCK_H ++#define _FAILLOCK_H ++ ++#include <stdint.h> ++ ++#define TALLY_STATUS_VALID 0x1 /* the tally file entry is valid */ ++#define TALLY_STATUS_RHOST 0x2 /* the source is rhost */ ++#define TALLY_STATUS_TTY 0x4 /* the source is tty - if both TALLY_FLAG_RHOST and TALLY_FLAG_TTY are not set the source is service */ ++ ++struct tally { ++ char source[52]; /* rhost or tty of the login failure (not necessarily NULL terminated) */ ++ uint16_t reserved; /* reserved for future use */ ++ uint16_t status; /* record status */ ++ uint64_t time; /* time of the login failure */ ++}; ++/* 64 bytes per entry */ ++ ++struct tally_data { ++ struct tally *records; /* array of tallies */ ++ unsigned int count; /* number of records */ ++}; ++ ++#define FAILLOCK_DEFAULT_TALLYDIR "/var/run/faillock" ++ ++int open_tally(const char *dir, const char *user, 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.1/modules/pam_faillock/faillock.8.xml.faillock Linux-PAM-1.1.1/modules/pam_faillock/faillock.8.xml +--- Linux-PAM-1.1.1/modules/pam_faillock/faillock.8.xml.faillock 2010-09-17 15:58:41.000000000 +0200 ++++ Linux-PAM-1.1.1/modules/pam_faillock/faillock.8.xml 2010-09-17 15:58:41.000000000 +0200 +@@ -0,0 +1,123 @@ ++<?xml version="1.0" encoding='UTF-8'?> ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" ++ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> ++ ++<refentry id="faillock"> ++ ++ <refmeta> ++ <refentrytitle>faillock</refentrytitle> ++ <manvolnum>8</manvolnum> ++ <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo> ++ </refmeta> ++ ++ <refnamediv id="pam_faillock-name"> ++ <refname>faillock</refname> ++ <refpurpose>Tool for displaying and modifying the authentication failure record files</refpurpose> ++ </refnamediv> ++ ++ <refsynopsisdiv> ++ <cmdsynopsis id="faillock-cmdsynopsis"> ++ <command>faillock</command> ++ <arg choice="opt"> ++ --dir <replaceable>/path/to/tally-directory</replaceable> ++ </arg> ++ <arg choice="opt"> ++ --user <replaceable>username</replaceable> ++ </arg> ++ <arg choice="opt"> ++ --reset ++ </arg> ++ </cmdsynopsis> ++ </refsynopsisdiv> ++ ++ <refsect1 id="faillock-description"> ++ ++ <title>DESCRIPTION</title> ++ ++ <para> ++ The <emphasis>pam_faillock.so</emphasis> module maintains a list of ++ failed authentication attempts per user during a specified interval ++ and locks the account in case there were more than ++ <replaceable>deny</replaceable> consecutive failed authentications. ++ It stores the failure records into per-user files in the tally ++ directory. ++ </para> ++ <para> ++ The <command>faillock</command> command is an application which ++ can be used to examine and modify the contents of the ++ the tally files. It can display the recent failed authentication ++ attempts of the <replaceable>username</replaceable> or clear the tally ++ files of all or individual <replaceable>usernames</replaceable>. ++ </para> ++ </refsect1> ++ ++ <refsect1 id="faillock-options"> ++ ++ <title>OPTIONS</title> ++ <variablelist> ++ <varlistentry> ++ <term> ++ <option>--dir <replaceable>/path/to/tally-directory</replaceable></option> ++ </term> ++ <listitem> ++ <para> ++ The directory where the user files with the failure records are kept. The ++ default is <filename>/var/run/faillock</filename>. ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term> ++ <option>--user <replaceable>username</replaceable></option> ++ </term> ++ <listitem> ++ <para> ++ The user whose failure records should be displayed or cleared. ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term> ++ <option>--reset</option> ++ </term> ++ <listitem> ++ <para> ++ Instead of displaying the user's failure records, clear them. ++ </para> ++ </listitem> ++ </varlistentry> ++ </variablelist> ++ </refsect1> ++ ++ <refsect1 id="faillock-files"> ++ <title>FILES</title> ++ <variablelist> ++ <varlistentry> ++ <term><filename>/var/run/faillock/*</filename></term> ++ <listitem> ++ <para>the files logging the authentication failures for users</para> ++ </listitem> ++ </varlistentry> ++ </variablelist> ++ </refsect1> ++ ++ <refsect1 id='faillock-see_also'> ++ <title>SEE ALSO</title> ++ <para> ++ <citerefentry> ++ <refentrytitle>pam_faillock</refentrytitle><manvolnum>8</manvolnum> ++ </citerefentry>, ++ <citerefentry> ++ <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum> ++ </citerefentry> ++ </para> ++ </refsect1> ++ ++ <refsect1 id='faillock-author'> ++ <title>AUTHOR</title> ++ <para> ++ faillock was written by Tomas Mraz. ++ </para> ++ </refsect1> ++ ++</refentry> +diff -up Linux-PAM-1.1.1/modules/pam_faillock/main.c.faillock Linux-PAM-1.1.1/modules/pam_faillock/main.c +--- Linux-PAM-1.1.1/modules/pam_faillock/main.c.faillock 2010-09-17 15:58:41.000000000 +0200 ++++ Linux-PAM-1.1.1/modules/pam_faillock/main.c 2010-09-17 15:58:41.000000000 +0200 +@@ -0,0 +1,231 @@ ++/* ++ * Copyright (c) 2010 Tomas Mraz <tmraz@redhat.com> ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, and the entire permission notice in its entirety, ++ * including the disclaimer of warranties. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The name of the author may not be used to endorse or promote ++ * products derived from this software without specific prior ++ * written permission. ++ * ++ * ALTERNATIVELY, this product may be distributed under the terms of ++ * the GNU Public License, in which case the provisions of the GPL are ++ * required INSTEAD OF the above restrictions. (This clause is ++ * necessary due to a potential bad interaction between the GPL and ++ * the restrictions contained in a BSD-style copyright.) ++ * ++ * THIS SOFTWARE IS PROVIDED ``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. ++ */ ++ ++#include "config.h" ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <dirent.h> ++#include <errno.h> ++#include <pwd.h> ++#include <time.h> ++#ifdef HAVE_LIBAUDIT ++#include <libaudit.h> ++#endif ++ ++#include "faillock.h" ++ ++struct options { ++ unsigned int reset; ++ const char *dir; ++ const char *user; ++ const char *progname; ++}; ++ ++static int ++args_parse(int argc, char **argv, struct options *opts) ++{ ++ int i; ++ memset(opts, 0, sizeof(*opts)); ++ ++ opts->dir = FAILLOCK_DEFAULT_TALLYDIR; ++ opts->progname = argv[0]; ++ ++ for (i = 1; i < argc; ++i) { ++ ++ if (strcmp(argv[i], "--dir") == 0) { ++ ++i; ++ if (i >= argc || strlen(argv[i]) == 0) { ++ fprintf(stderr, "%s: No directory supplied.\n", argv[0]); ++ return -1; ++ } ++ opts->dir = argv[i]; ++ } ++ else if (strcmp(argv[i], "--user") == 0) { ++ ++i; ++ if (i >= argc || strlen(argv[i]) == 0) { ++ fprintf(stderr, "%s: No user name supplied.\n", argv[0]); ++ return -1; ++ } ++ opts->user = argv[i]; ++ } ++ else if (strcmp(argv[i], "--reset") == 0) { ++ opts->reset = 1; ++ } ++ else { ++ fprintf(stderr, "%s: Unknown option: %s\n", argv[0], argv[i]); ++ return -1; ++ } ++ } ++ return 0; ++} ++ ++static void ++usage(const char *progname) ++{ ++ fprintf(stderr, _("Usage: %s [--dir /path/to/tally-directory] [--user username] [--reset]\n"), ++ progname); ++} ++ ++static int ++do_user(struct options *opts, const char *user) ++{ ++ int fd; ++ int rv; ++ struct tally_data tallies; ++ ++ fd = open_tally(opts->dir, user, 0); ++ ++ if (fd == -1) { ++ if (errno == ENOENT) { ++ return 0; ++ } ++ else { ++ fprintf(stderr, "%s: Error opening the tally file for %s:", ++ opts->progname, user); ++ perror(NULL); ++ return 3; ++ } ++ } ++ if (opts->reset) { ++#ifdef HAVE_LIBAUDIT ++ char buf[64]; ++ int audit_fd; ++#endif ++ ++ while ((rv=ftruncate(fd, 0)) == -1 && errno == EINTR); ++ if (rv == -1) { ++ fprintf(stderr, "%s: Error clearing the tally file for %s:", ++ opts->progname, user); ++ perror(NULL); ++#ifdef HAVE_LIBAUDIT ++ } ++ if ((audit_fd=audit_open()) >= 0) { ++ struct passwd *pwd; ++ ++ if ((pwd=getpwnam(user)) != NULL) { ++ snprintf(buf, sizeof(buf), "faillock reset uid=%u", ++ pwd->pw_uid); ++ audit_log_user_message(audit_fd, AUDIT_USER_ACCT, ++ buf, NULL, NULL, NULL, rv == 0); ++ } ++ close(audit_fd); ++ } ++ if (rv == -1) { ++#endif ++ close(fd); ++ return 4; ++ } ++ } ++ else { ++ unsigned int i; ++ ++ memset(&tallies, 0, sizeof(tallies)); ++ if ((rv=read_tally(fd, &tallies)) == -1) { ++ fprintf(stderr, "%s: Error reading the tally file for %s:", ++ opts->progname, user); ++ perror(NULL); ++ close(fd); ++ return 5; ++ } ++ ++ printf("%s:\n", user); ++ printf("%-19s %-5s %-48s %-5s\n", "When", "Type", "Source", "Valid"); ++ ++ for (i = 0; i < tallies.count; i++) { ++ struct tm *tm; ++ char timebuf[80]; ++ uint16_t status = tallies.records[i].status; ++ time_t when = tallies.records[i].time; ++ ++ tm = localtime(&when); ++ strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S", tm); ++ printf("%-19s %-5s %-52.52s %s\n", timebuf, ++ status & TALLY_STATUS_RHOST ? "RHOST" : (status & TALLY_STATUS_TTY ? "TTY" : "SVC"), ++ tallies.records[i].source, status & TALLY_STATUS_VALID ? "V":"I"); ++ } ++ free(tallies.records); ++ } ++ close(fd); ++ return 0; ++} ++ ++static int ++do_allusers(struct options *opts) ++{ ++ struct dirent **userlist; ++ int rv, i; ++ ++ rv = scandir(opts->dir, &userlist, NULL, alphasort); ++ if (rv < 0) { ++ fprintf(stderr, "%s: Error reading tally directory: ", opts->progname); ++ perror(NULL); ++ return 2; ++ } ++ ++ for (i = 0; i < rv; i++) { ++ if (userlist[i]->d_name[0] == '.') { ++ if ((userlist[i]->d_name[1] == '.' && userlist[i]->d_name[2] == '\0') || ++ userlist[i]->d_name[1] == '\0') ++ continue; ++ } ++ do_user(opts, userlist[i]->d_name); ++ free(userlist[i]); ++ } ++ free(userlist); ++ ++ return 0; ++} ++ ++ ++/*-----------------------------------------------------------------------*/ ++int ++main (int argc, char *argv[]) ++{ ++ struct options opts; ++ ++ if (args_parse(argc, argv, &opts)) { ++ usage(argv[0]); ++ return 1; ++ } ++ ++ if (opts.user == NULL) { ++ return do_allusers(&opts); ++ } ++ ++ return do_user(&opts, opts.user); ++} ++ +diff -up Linux-PAM-1.1.1/modules/pam_faillock/Makefile.am.faillock Linux-PAM-1.1.1/modules/pam_faillock/Makefile.am +--- Linux-PAM-1.1.1/modules/pam_faillock/Makefile.am.faillock 2010-09-17 15:58:41.000000000 +0200 ++++ Linux-PAM-1.1.1/modules/pam_faillock/Makefile.am 2010-09-17 15:58:41.000000000 +0200 +@@ -0,0 +1,43 @@ ++# ++# Copyright (c) 2005, 2006, 2007, 2009 Thorsten Kukuk <kukuk@thkukuk.de> ++# Copyright (c) 2008 Red Hat, Inc. ++# Copyright (c) 2010 Tomas Mraz <tmraz@redhat.com> ++# ++ ++CLEANFILES = *~ ++MAINTAINERCLEANFILES = $(MANS) README ++ ++EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_faillock ++ ++man_MANS = pam_faillock.8 faillock.8 ++XMLS = README.xml pam_faillock.8.xml faillock.8.xml ++ ++TESTS = tst-pam_faillock ++ ++securelibdir = $(SECUREDIR) ++secureconfdir = $(SCONFIGDIR) ++ ++noinst_HEADERS = faillock.h ++ ++faillock_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include ++pam_faillock_la_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include ++ ++pam_faillock_la_LDFLAGS = -no-undefined -avoid-version -module ++pam_faillock_la_LIBADD = -L$(top_builddir)/libpam -lpam $(LIBAUDIT) ++if HAVE_VERSIONING ++ pam_faillock_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map ++endif ++ ++faillock_LDADD = -L$(top_builddir)/libpam -lpam $(LIBAUDIT) ++ ++securelib_LTLIBRARIES = pam_faillock.la ++sbin_PROGRAMS = faillock ++ ++pam_faillock_la_SOURCES = pam_faillock.c faillock.c ++faillock_SOURCES = main.c faillock.c ++ ++if ENABLE_REGENERATE_MAN ++noinst_DATA = README ++README: pam_faillock.8.xml ++-include $(top_srcdir)/Make.xml.rules ++endif +diff -up Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.c.faillock Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.c +--- Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.c.faillock 2010-09-17 15:58:41.000000000 +0200 ++++ Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.c 2010-09-17 15:58:41.000000000 +0200 +@@ -0,0 +1,550 @@ ++/* ++ * Copyright (c) 2010 Tomas Mraz <tmraz@redhat.com> ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, and the entire permission notice in its entirety, ++ * including the disclaimer of warranties. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The name of the author may not be used to endorse or promote ++ * products derived from this software without specific prior ++ * written permission. ++ * ++ * ALTERNATIVELY, this product may be distributed under the terms of ++ * the GNU Public License, in which case the provisions of the GPL are ++ * required INSTEAD OF the above restrictions. (This clause is ++ * necessary due to a potential bad interaction between the GPL and ++ * the restrictions contained in a BSD-style copyright.) ++ * ++ * THIS SOFTWARE IS PROVIDED ``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. ++ */ ++ ++#include "config.h" ++#include <stdio.h> ++#include <string.h> ++#include <unistd.h> ++#include <stdint.h> ++#include <stdlib.h> ++#include <errno.h> ++#include <time.h> ++#include <pwd.h> ++#include <syslog.h> ++ ++#ifdef HAVE_LIBAUDIT ++#include <libaudit.h> ++#endif ++ ++#include <security/pam_modules.h> ++#include <security/pam_modutil.h> ++#include <security/pam_ext.h> ++ ++#include "faillock.h" ++ ++#define PAM_SM_AUTH ++#define PAM_SM_ACCOUNT ++ ++#define FAILLOCK_ACTION_PREAUTH 0 ++#define FAILLOCK_ACTION_AUTHSUCC 1 ++#define FAILLOCK_ACTION_AUTHFAIL 2 ++ ++#define FAILLOCK_FLAG_DENY_ROOT 0x1 ++#define FAILLOCK_FLAG_AUDIT 0x2 ++#define FAILLOCK_FLAG_SILENT 0x4 ++#define FAILLOCK_FLAG_NO_LOG_INFO 0x8 ++#define FAILLOCK_FLAG_UNLOCKED 0x10 ++ ++#define MAX_TIME_INTERVAL 604800 /* 7 days */ ++ ++struct options { ++ unsigned int action; ++ unsigned int flags; ++ unsigned short deny; ++ unsigned int fail_interval; ++ unsigned int unlock_time; ++ unsigned int root_unlock_time; ++ const char *dir; ++ const char *user; ++ int failures; ++ uint64_t latest_time; ++ uid_t uid; ++ uint64_t now; ++}; ++ ++static void ++args_parse(pam_handle_t *pamh, int argc, const char **argv, ++ int flags, struct options *opts) ++{ ++ int i; ++ memset(opts, 0, sizeof(*opts)); ++ ++ opts->dir = FAILLOCK_DEFAULT_TALLYDIR; ++ opts->deny = 3; ++ opts->fail_interval = 900; ++ opts->unlock_time = 600; ++ opts->root_unlock_time = MAX_TIME_INTERVAL+1; ++ ++ for (i = 0; i < argc; ++i) { ++ ++ if (strncmp(argv[i], "dir=", 4) == 0) { ++ if (argv[i][4] != '/') { ++ pam_syslog(pamh, LOG_ERR, ++ "Tally directory is not absolute path (%s); keeping default", argv[i]); ++ } else { ++ opts->dir = argv[i]+4; ++ } ++ } ++ else if (strncmp(argv[i], "deny=", 5) == 0) { ++ if (sscanf(argv[i]+5, "%hu", &opts->deny) != 1) { ++ pam_syslog(pamh, LOG_ERR, ++ "Bad number supplied for deny argument"); ++ } ++ } ++ else if (strncmp(argv[i], "fail_interval=", 14) == 0) { ++ unsigned int temp; ++ if (sscanf(argv[i]+14, "%u", &temp) != 1 || ++ temp > MAX_TIME_INTERVAL) { ++ pam_syslog(pamh, LOG_ERR, ++ "Bad number supplied for fail_interval argument"); ++ } else { ++ opts->fail_interval = temp; ++ } ++ } ++ else if (strncmp(argv[i], "unlock_time=", 12) == 0) { ++ unsigned int temp; ++ if (sscanf(argv[i]+12, "%u", &temp) != 1 || ++ temp > MAX_TIME_INTERVAL) { ++ pam_syslog(pamh, LOG_ERR, ++ "Bad number supplied for unlock_time argument"); ++ } else { ++ opts->unlock_time = temp; ++ } ++ } ++ else if (strncmp(argv[i], "root_unlock_time=", 17) == 0) { ++ unsigned int temp; ++ if (sscanf(argv[i]+17, "%u", &temp) != 1 || ++ temp > MAX_TIME_INTERVAL) { ++ pam_syslog(pamh, LOG_ERR, ++ "Bad number supplied for root_unlock_time argument"); ++ } else { ++ opts->root_unlock_time = temp; ++ } ++ } ++ else if (strcmp(argv[i], "preauth") == 0) { ++ opts->action = FAILLOCK_ACTION_PREAUTH; ++ } ++ else if (strcmp(argv[i], "authfail") == 0) { ++ opts->action = FAILLOCK_ACTION_AUTHFAIL; ++ } ++ else if (strcmp(argv[i], "authsucc") == 0) { ++ opts->action = FAILLOCK_ACTION_AUTHSUCC; ++ } ++ else if (strcmp(argv[i], "even_deny_root") == 0) { ++ opts->flags |= FAILLOCK_FLAG_DENY_ROOT; ++ } ++ else if (strcmp(argv[i], "audit") == 0) { ++ opts->flags |= FAILLOCK_FLAG_AUDIT; ++ } ++ else if (strcmp(argv[i], "silent") == 0) { ++ opts->flags |= FAILLOCK_FLAG_SILENT; ++ } ++ else if (strcmp(argv[i], "no_log_info") == 0) { ++ opts->flags |= FAILLOCK_FLAG_NO_LOG_INFO; ++ } ++ else { ++ pam_syslog(pamh, LOG_ERR, "Unknown option: %s", argv[i]); ++ } ++ } ++ ++ if (opts->root_unlock_time == MAX_TIME_INTERVAL+1) ++ opts->root_unlock_time = opts->unlock_time; ++ if (flags & PAM_SILENT) ++ opts->flags |= FAILLOCK_FLAG_SILENT; ++} ++ ++static int get_pam_user(pam_handle_t *pamh, struct options *opts) ++{ ++ const char *user; ++ int rv; ++ struct passwd *pwd; ++ ++ if ((rv=pam_get_user(pamh, &user, NULL)) != PAM_SUCCESS) { ++ return rv; ++ } ++ ++ if (*user == '\0') { ++ return PAM_IGNORE; ++ } ++ ++ if ((pwd=pam_modutil_getpwnam(pamh, user)) == NULL) { ++ if (opts->flags & FAILLOCK_FLAG_AUDIT) { ++ pam_syslog(pamh, LOG_ERR, "User unknown: %s", user); ++ } ++ else { ++ pam_syslog(pamh, LOG_ERR, "User unknown"); ++ } ++ return PAM_IGNORE; ++ } ++ opts->user = user; ++ opts->uid = pwd->pw_uid; ++ return PAM_SUCCESS; ++} ++ ++static int ++check_tally(pam_handle_t *pamh, struct options *opts, struct tally_data *tallies, int *fd) ++{ ++ int tfd; ++ unsigned int i; ++ uint64_t latest_time; ++ int failures; ++ ++ opts->now = time(NULL); ++ ++ tfd = open_tally(opts->dir, opts->user, 0); ++ ++ *fd = tfd; ++ ++ if (tfd == -1) { ++ if (errno == EACCES || errno == ENOENT) { ++ return PAM_SUCCESS; ++ } ++ pam_syslog(pamh, LOG_ERR, "Error opening the tally file for %s: %m", opts->user); ++ return PAM_SYSTEM_ERR; ++ } ++ ++ if (read_tally(tfd, tallies) != 0) { ++ pam_syslog(pamh, LOG_ERR, "Error reading the tally file for %s: %m", opts->user); ++ return PAM_SYSTEM_ERR; ++ } ++ ++ if (opts->uid == 0 && !(opts->flags & FAILLOCK_FLAG_DENY_ROOT)) { ++ return PAM_SUCCESS; ++ } ++ ++ latest_time = 0; ++ for(i = 0; i < tallies->count; i++) { ++ if ((tallies->records[i].status & TALLY_STATUS_VALID) && ++ tallies->records[i].time > latest_time) ++ latest_time = tallies->records[i].time; ++ } ++ ++ opts->latest_time = latest_time; ++ ++ failures = 0; ++ for(i = 0; i < tallies->count; i++) { ++ if ((tallies->records[i].status & TALLY_STATUS_VALID) && ++ latest_time - tallies->records[i].time < opts->fail_interval) { ++ ++failures; ++ } ++ } ++ ++ opts->failures = failures; ++ ++ if (opts->uid == 0 && !(opts->flags & FAILLOCK_FLAG_DENY_ROOT)) { ++ return PAM_SUCCESS; ++ } ++ ++ if (opts->deny && failures >= opts->deny) { ++ if ((opts->uid && latest_time + opts->unlock_time < opts->now) || ++ (!opts->uid && latest_time + opts->root_unlock_time < opts->now)) { ++#ifdef HAVE_LIBAUDIT ++ if (opts->action != FAILLOCK_ACTION_PREAUTH) { /* do not audit in preauth */ ++ char buf[64]; ++ int audit_fd; ++ ++ audit_fd = audit_open(); ++ /* If there is an error & audit support is in the kernel report error */ ++ if ((audit_fd < 0) && !(errno == EINVAL || errno == EPROTONOSUPPORT || ++ errno == EAFNOSUPPORT)) ++ return PAM_SYSTEM_ERR; ++ ++ snprintf(buf, sizeof(buf), "pam_faillock uid=%u ", opts->uid); ++ audit_log_user_message(audit_fd, AUDIT_RESP_ACCT_UNLOCK_TIMED, buf, ++ NULL, NULL, NULL, 1); ++ } ++#endif ++ opts->flags |= FAILLOCK_FLAG_UNLOCKED; ++ return PAM_SUCCESS; ++ } ++ return PAM_AUTH_ERR; ++ } ++ return PAM_SUCCESS; ++} ++ ++static void ++reset_tally(pam_handle_t *pamh, struct options *opts, int *fd) ++{ ++ 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); ++ } ++} ++ ++static int ++write_tally(pam_handle_t *pamh, struct options *opts, struct tally_data *tallies, int *fd) ++{ ++ struct tally *records; ++ unsigned int i; ++ int failures; ++ unsigned int oldest; ++ uint64_t oldtime; ++ const void *source = NULL; ++ ++ if (*fd == -1) { ++ *fd = open_tally(opts->dir, opts->user, 1); ++ } ++ if (*fd == -1) { ++ if (errno == EACCES) { ++ return PAM_SUCCESS; ++ } ++ pam_syslog(pamh, LOG_ERR, "Error opening the tally file for %s: %m", opts->user); ++ return PAM_SYSTEM_ERR; ++ } ++ ++ oldtime = 0; ++ oldest = 0; ++ failures = 0; ++ ++ for (i = 0; i < tallies->count; ++i) { ++ if (tallies->records[i].time < oldtime) { ++ oldtime = tallies->records[i].time; ++ oldest = i; ++ } ++ if (opts->flags & FAILLOCK_FLAG_UNLOCKED || ++ opts->now - tallies->records[i].time >= opts->fail_interval ) { ++ tallies->records[i].status &= ~TALLY_STATUS_VALID; ++ } else { ++ ++failures; ++ } ++ } ++ ++ if (oldest >= tallies->count || (tallies->records[oldest].status & TALLY_STATUS_VALID)) { ++ oldest = tallies->count; ++ ++ if ((records=realloc(tallies->records, (oldest+1) * sizeof (*tallies->records))) == NULL) { ++ pam_syslog(pamh, LOG_CRIT, "Error allocating memory for tally records: %m"); ++ return PAM_BUF_ERR; ++ } ++ ++ ++tallies->count; ++ tallies->records = records; ++ } ++ ++ memset(&tallies->records[oldest], 0, sizeof (*tallies->records)); ++ ++ tallies->records[oldest].status = TALLY_STATUS_VALID; ++ if (pam_get_item(pamh, PAM_RHOST, &source) != PAM_SUCCESS || source == NULL) { ++ if (pam_get_item(pamh, PAM_TTY, &source) != PAM_SUCCESS || source == NULL) { ++ if (pam_get_item(pamh, PAM_SERVICE, &source) != PAM_SUCCESS || source == NULL) { ++ source = ""; ++ } ++ } ++ else { ++ tallies->records[oldest].status |= TALLY_STATUS_TTY; ++ } ++ } ++ else { ++ tallies->records[oldest].status |= TALLY_STATUS_RHOST; ++ } ++ ++ strncpy(tallies->records[oldest].source, source, sizeof(tallies->records[oldest].source)); ++ /* source does not have to be null terminated */ ++ ++ tallies->records[oldest].time = opts->now; ++ ++ ++failures; ++ ++ if (opts->deny && failures == opts->deny) { ++#ifdef HAVE_LIBAUDIT ++ char buf[64]; ++ int audit_fd; ++ ++ audit_fd = audit_open(); ++ /* If there is an error & audit support is in the kernel report error */ ++ if ((audit_fd < 0) && !(errno == EINVAL || errno == EPROTONOSUPPORT || ++ errno == EAFNOSUPPORT)) ++ return PAM_SYSTEM_ERR; ++ ++ snprintf(buf, sizeof(buf), "pam_faillock uid=%u ", opts->uid); ++ audit_log_user_message(audit_fd, AUDIT_ANOM_LOGIN_FAILURES, buf, ++ NULL, NULL, NULL, 1); ++ ++ if (opts->uid != 0 || (opts->flags & FAILLOCK_FLAG_DENY_ROOT)) { ++ audit_log_user_message(audit_fd, AUDIT_RESP_ACCT_LOCK, buf, ++ NULL, NULL, NULL, 1); ++ } ++ close(audit_fd); ++#endif ++ if (!(opts->flags & FAILLOCK_FLAG_NO_LOG_INFO)) { ++ pam_syslog(pamh, LOG_INFO, "Consecutive login failures for user %s account temporarily locked", ++ opts->user); ++ } ++ } ++ ++ if (update_tally(*fd, tallies) == 0) ++ return PAM_SUCCESS; ++ ++ return PAM_SYSTEM_ERR; ++} ++ ++static void ++faillock_message(pam_handle_t *pamh, struct options *opts) ++{ ++ int64_t left; ++ ++ if (!(opts->flags & FAILLOCK_FLAG_SILENT)) { ++ if (opts->uid) { ++ left = opts->latest_time + opts->unlock_time - opts->now; ++ } ++ else { ++ left = opts->latest_time + opts->root_unlock_time - opts->now; ++ } ++ ++ left /= 60; /* minutes */ ++ ++ pam_info(pamh, _("Account temporarily locked due to %d failed logins"), ++ opts->failures); ++ pam_info(pamh, _("(%d minutes left to unlock)"), (int)left); ++ } ++} ++ ++static void ++tally_cleanup(struct tally_data *tallies, int fd) ++{ ++ if (fd != -1) { ++ close(fd); ++ } ++ ++ free(tallies->records); ++} ++ ++/*---------------------------------------------------------------------*/ ++ ++PAM_EXTERN int ++pam_sm_authenticate(pam_handle_t *pamh, int flags, ++ int argc, const char **argv) ++{ ++ struct options opts; ++ int rv, fd = -1; ++ struct tally_data tallies; ++ ++ memset(&tallies, 0, sizeof(tallies)); ++ ++ args_parse(pamh, argc, argv, flags, &opts); ++ ++ pam_fail_delay(pamh, 2000000); /* 2 sec delay for on failure */ ++ ++ if ((rv=get_pam_user(pamh, &opts)) != PAM_SUCCESS) { ++ return rv; ++ } ++ ++ switch (opts.action) { ++ case FAILLOCK_ACTION_PREAUTH: ++ rv = check_tally(pamh, &opts, &tallies, &fd); ++ if (rv == PAM_AUTH_ERR && !(opts.flags & FAILLOCK_FLAG_SILENT)) { ++ faillock_message(pamh, &opts); ++ } ++ break; ++ ++ case FAILLOCK_ACTION_AUTHSUCC: ++ rv = check_tally(pamh, &opts, &tallies, &fd); ++ if (rv == PAM_SUCCESS && fd != -1) { ++ reset_tally(pamh, &opts, &fd); ++ } ++ break; ++ ++ case FAILLOCK_ACTION_AUTHFAIL: ++ rv = check_tally(pamh, &opts, &tallies, &fd); ++ if (rv == PAM_SUCCESS) { ++ rv = PAM_IGNORE; /* this return value should be ignored */ ++ write_tally(pamh, &opts, &tallies, &fd); ++ } ++ break; ++ } ++ ++ tally_cleanup(&tallies, fd); ++ ++ return rv; ++} ++ ++/*---------------------------------------------------------------------*/ ++ ++PAM_EXTERN int ++pam_sm_setcred(pam_handle_t *pamh UNUSED, int flags UNUSED, ++ int argc UNUSED, const char **argv UNUSED) ++{ ++ return PAM_SUCCESS; ++} ++ ++/*---------------------------------------------------------------------*/ ++ ++PAM_EXTERN int ++pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, ++ int argc, const char **argv) ++{ ++ struct options opts; ++ int rv, fd = -1; ++ struct tally_data tallies; ++ ++ memset(&tallies, 0, sizeof(tallies)); ++ ++ args_parse(pamh, argc, argv, flags, &opts); ++ ++ opts.action = FAILLOCK_ACTION_AUTHSUCC; ++ ++ if ((rv=get_pam_user(pamh, &opts)) != PAM_SUCCESS) { ++ return rv; ++ } ++ ++ check_tally(pamh, &opts, &tallies, &fd); ++ if (fd != -1) { ++ reset_tally(pamh, &opts, &fd); ++ } ++ ++ tally_cleanup(&tallies, fd); ++ ++ return PAM_SUCCESS; ++} ++ ++/*-----------------------------------------------------------------------*/ ++ ++#ifdef PAM_STATIC ++ ++/* static module data */ ++ ++struct pam_module _pam_faillock_modstruct = { ++ MODULE_NAME, ++#ifdef PAM_SM_AUTH ++ pam_sm_authenticate, ++ pam_sm_setcred, ++#else ++ NULL, ++ NULL, ++#endif ++#ifdef PAM_SM_ACCOUNT ++ pam_sm_acct_mgmt, ++#else ++ NULL, ++#endif ++ NULL, ++ NULL, ++ NULL, ++}; ++ ++#endif /* #ifdef PAM_STATIC */ ++ +diff -up Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.8.xml.faillock Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.8.xml +--- Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.8.xml.faillock 2010-09-17 15:58:41.000000000 +0200 ++++ Linux-PAM-1.1.1/modules/pam_faillock/pam_faillock.8.xml 2010-09-17 15:58:41.000000000 +0200 +@@ -0,0 +1,396 @@ ++<?xml version="1.0" encoding='UTF-8'?> ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" ++ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> ++ ++<refentry id="pam_faillock"> ++ ++ <refmeta> ++ <refentrytitle>pam_faillock</refentrytitle> ++ <manvolnum>8</manvolnum> ++ <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo> ++ </refmeta> ++ ++ <refnamediv id="pam_faillock-name"> ++ <refname>pam_faillock</refname> ++ <refpurpose>Module counting authentication failures during a specified interval</refpurpose> ++ </refnamediv> ++ ++ <refsynopsisdiv> ++ <cmdsynopsis id="pam_faillock-cmdsynopsisauth"> ++ <command>auth ... pam_faillock.so</command> ++ <arg choice="req"> ++ preauth|authfail|authsucc ++ </arg> ++ <arg choice="opt"> ++ dir=<replaceable>/path/to/tally-directory</replaceable> ++ </arg> ++ <arg choice="opt"> ++ even_deny_root ++ </arg> ++ <arg choice="opt"> ++ deny=<replaceable>n</replaceable> ++ </arg> ++ <arg choice="opt"> ++ fail_interval=<replaceable>n</replaceable> ++ </arg> ++ <arg choice="opt"> ++ unlock_time=<replaceable>n</replaceable> ++ </arg> ++ <arg choice="opt"> ++ root_unlock_time=<replaceable>n</replaceable> ++ </arg> ++ <arg choice="opt"> ++ audit ++ </arg> ++ <arg choice="opt"> ++ silent ++ </arg> ++ <arg choice="opt"> ++ no_log_info ++ </arg> ++ </cmdsynopsis> ++ <cmdsynopsis id="pam_faillock-cmdsynopsisacct"> ++ <command>account ... pam_faillock.so</command> ++ <arg choice="opt"> ++ dir=<replaceable>/path/to/tally-directory</replaceable> ++ </arg> ++ <arg choice="opt"> ++ no_log_info ++ </arg> ++ </cmdsynopsis> ++ </refsynopsisdiv> ++ ++ <refsect1 id="pam_faillock-description"> ++ ++ <title>DESCRIPTION</title> ++ ++ <para> ++ This module maintains a list of failed authentication attempts per ++ user during a specified interval and locks the account in case ++ there were more than <replaceable>deny</replaceable> consecutive ++ failed authentications. ++ </para> ++ <para> ++ Normally, failed attempts to authenticate <emphasis>root</emphasis> will ++ <emphasis remap='B'>not</emphasis> cause the root account to become ++ blocked, to prevent denial-of-service: if your users aren't given ++ shell accounts and root may only login via <command>su</command> or ++ at the machine console (not telnet/rsh, etc), this is safe. ++ </para> ++ </refsect1> ++ ++ <refsect1 id="pam_faillock-options"> ++ ++ <title>OPTIONS</title> ++ <variablelist> ++ <varlistentry> ++ <term> ++ <option>{preauth|authfail|authsucc}</option> ++ </term> ++ <listitem> ++ <para> ++ This argument must be set accordingly to the position of this module ++ instance in the PAM stack. ++ </para> ++ <para> ++ The <emphasis>preauth</emphasis> argument must be used when the module ++ is called before the modules which ask for the user credentials such ++ as the password. The module just examines whether the user should ++ be blocked from accessing the service in case there were anomalous ++ number of failed consecutive authentication attempts recently. This ++ call is optional if <emphasis>authsucc</emphasis> is used. ++ </para> ++ <para> ++ The <emphasis>authfail</emphasis> argument must be used when the module ++ is called after the modules which determine the authentication outcome, ++ failed. Unless the user is already blocked due to previous authentication ++ failures, the module will record the failure into the appropriate user ++ tally file. ++ </para> ++ <para> ++ The <emphasis>authsucc</emphasis> argument must be used when the module ++ is called after the modules which determine the authentication outcome, ++ succeded. Unless the user is already blocked due to previous authentication ++ failures, the module will then clear the record of the failures in the ++ respective user tally file. Otherwise it will return authentication error. ++ If this call is not done, the pam_faillock will not distinguish between ++ consecutive and non-consecutive failed authentication attempts. The ++ <emphasis>preauth</emphasis> call must be used in such case. Due to ++ complications in the way the PAM stack can be configured it is also ++ possible to call <emphasis>pam_faillock</emphasis> as an account module. ++ In such configuration the module must be also called in the ++ <emphasis>preauth</emphasis> stage. ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term> ++ <option>dir=<replaceable>/path/to/tally-directory</replaceable></option> ++ </term> ++ <listitem> ++ <para> ++ The directory where the user files with the failure records are kept. The ++ default is <filename>/var/run/faillock</filename>. ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term> ++ <option>audit</option> ++ </term> ++ <listitem> ++ <para> ++ Will log the user name into the system log if the user is not found. ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term> ++ <option>silent</option> ++ </term> ++ <listitem> ++ <para> ++ Don't print informative messages. This option is implicite ++ in the <emphasis>authfail</emphasis> and <emphasis>authsucc</emphasis> ++ functions. ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term> ++ <option>no_log_info</option> ++ </term> ++ <listitem> ++ <para> ++ Don't log informative messages via <citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>. ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term> ++ <option>deny=<replaceable>n</replaceable></option> ++ </term> ++ <listitem> ++ <para> ++ Deny access if the number of consecutive authentication failures ++ for this user during the recent interval exceeds ++ <replaceable>n</replaceable>. The default is 3. ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term> ++ <option>fail_interval=<replaceable>n</replaceable></option> ++ </term> ++ <listitem> ++ <para> ++ The length of the interval during which the consecutive ++ authentication failures must happen for the user account ++ lock out is <replaceable>n</replaceable> seconds. ++ The default is 900 (15 minutes). ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term> ++ <option>unlock_time=<replaceable>n</replaceable></option> ++ </term> ++ <listitem> ++ <para> ++ The access will be reenabled after ++ <replaceable>n</replaceable> seconds after the lock out. ++ The default is 600 (10 minutes). ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term> ++ <option>even_deny_root</option> ++ </term> ++ <listitem> ++ <para> ++ Root account can become locked as well as regular accounts. ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term> ++ <option>root_unlock_time=<replaceable>n</replaceable></option> ++ </term> ++ <listitem> ++ <para> ++ This option implies <option>even_deny_root</option> option. ++ Allow access after <replaceable>n</replaceable> seconds ++ to root account after the account is locked. In case the ++ option is not specified the value is the same as of the ++ <option>unlock_time</option> option. ++ </para> ++ </listitem> ++ </varlistentry> ++ </variablelist> ++ </refsect1> ++ ++ <refsect1 id="pam_faillock-types"> ++ <title>MODULE TYPES PROVIDED</title> ++ <para> ++ The <option>auth</option> and <option>account</option> module types are ++ provided. ++ </para> ++ </refsect1> ++ ++ <refsect1 id='pam_faillock-return_values'> ++ <title>RETURN VALUES</title> ++ <variablelist> ++ <varlistentry> ++ <term>PAM_AUTH_ERR</term> ++ <listitem> ++ <para> ++ A invalid option was given, the module was not able ++ to retrieve the user name, no valid counter file ++ was found, or too many failed logins. ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term>PAM_SUCCESS</term> ++ <listitem> ++ <para> ++ Everything was successful. ++ </para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> ++ <term>PAM_IGNORE</term> ++ <listitem> ++ <para> ++ User not present in passwd database. ++ </para> ++ </listitem> ++ </varlistentry> ++ </variablelist> ++ </refsect1> ++ ++ <refsect1 id='pam_faillock-notes'> ++ <title>NOTES</title> ++ <para> ++ <emphasis>pam_faillock</emphasis> setup in the PAM stack is different ++ 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>. ++ </para> ++ <para> ++ Note that using the module in <option>preauth</option> without the ++ <option>silent</option> option or with <emphasis>requisite</emphasis> ++ control field leaks an information about existence or ++ non-existence of an user account in the system because ++ the failures are not recorded for the unknown users. The message ++ about the user account being locked is never displayed for nonexisting ++ user accounts allowing the adversary to infer that a particular account ++ is not existing on a system. ++ </para> ++ </refsect1> ++ ++ <refsect1 id='pam_faillock-examples'> ++ <title>EXAMPLES</title> ++ <para> ++ Here are two possible configuration examples for <filename>/etc/pam.d/login</filename>. ++ They make <emphasis>pam_faillock</emphasis> to lock the account after 4 consecutive ++ failed logins during the default interval of 15 minutes. Root account will be locked ++ as well. The accounts will be automatically unlocked after 20 minutes. ++ </para> ++ <para> ++ In the first example the module is called only in the <emphasis>auth</emphasis> ++ phase and the module does not print any information about the account blocking ++ by <emphasis>pam_faillock</emphasis>. The <emphasis>preauth</emphasis> call can ++ be added to tell the user that his login is blocked by the module and also to abort ++ the authentication without even asking for password in such case. ++ </para> ++ <programlisting> ++auth required pam_securetty.so ++auth required pam_env.so ++auth required pam_nologin.so ++# optionally call: auth requisite pam_faillock.so preauth deny=4 even_deny_root unlock_time=1200 ++# to display the message about account being locked ++auth [success=1 default=bad] pam_unix.so ++auth [default=die] pam_faillock.so authfail deny=4 even_deny_root unlock_time=1200 ++auth sufficient pam_faillock.so authsucc deny=4 even_deny_root unlock_time=1200 ++auth required pam_deny.so ++account required pam_unix.so ++password required pam_unix.so shadow ++session required pam_selinux.so close ++session required pam_loginuid.so ++session required pam_unix.so ++session required pam_selinux.so open ++ </programlisting> ++ <para> ++ In the second example the module is called both in the <emphasis>auth</emphasis> ++ and <emphasis>account</emphasis> phases and the module gives the authenticating ++ user message when the account is locked ++ </para> ++ <programlisting> ++auth required pam_securetty.so ++auth required pam_env.so ++auth required pam_nologin.so ++auth required pam_faillock.so preauth silent deny=4 even_deny_root unlock_time=1200 ++# optionally use requisite above if you do not want to prompt for the password ++# on locked accounts, possibly with removing the silent option as well ++auth sufficient pam_unix.so ++auth [default=die] pam_faillock.so authfail deny=4 even_deny_root unlock_time=1200 ++auth required pam_deny.so ++account required pam_faillock.so ++# if you drop the above call to pam_faillock.so the lock will be done also ++# on non-consecutive authentication failures ++account required pam_unix.so ++password required pam_unix.so shadow ++session required pam_selinux.so close ++session required pam_loginuid.so ++session required pam_unix.so ++session required pam_selinux.so open ++ </programlisting> ++ </refsect1> ++ ++ <refsect1 id="pam_faillock-files"> ++ <title>FILES</title> ++ <variablelist> ++ <varlistentry> ++ <term><filename>/var/run/faillock/*</filename></term> ++ <listitem> ++ <para>the files logging the authentication failures for users</para> ++ </listitem> ++ </varlistentry> ++ </variablelist> ++ </refsect1> ++ ++ <refsect1 id='pam_faillock-see_also'> ++ <title>SEE ALSO</title> ++ <para> ++ <citerefentry> ++ <refentrytitle>faillock</refentrytitle><manvolnum>8</manvolnum> ++ </citerefentry>, ++ <citerefentry> ++ <refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum> ++ </citerefentry>, ++ <citerefentry> ++ <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum> ++ </citerefentry>, ++ <citerefentry> ++ <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum> ++ </citerefentry> ++ </para> ++ </refsect1> ++ ++ <refsect1 id='pam_faillock-author'> ++ <title>AUTHOR</title> ++ <para> ++ pam_faillock was written by Tomas Mraz. ++ </para> ++ </refsect1> ++ ++</refentry> +diff -up Linux-PAM-1.1.1/modules/pam_faillock/README.xml.faillock Linux-PAM-1.1.1/modules/pam_faillock/README.xml +--- Linux-PAM-1.1.1/modules/pam_faillock/README.xml.faillock 2010-09-17 15:58:41.000000000 +0200 ++++ Linux-PAM-1.1.1/modules/pam_faillock/README.xml 2010-09-17 15:58:41.000000000 +0200 +@@ -0,0 +1,46 @@ ++<?xml version="1.0" encoding='UTF-8'?> ++<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" ++"http://www.docbook.org/xml/4.3/docbookx.dtd" ++[ ++<!-- ++<!ENTITY pamaccess SYSTEM "pam_faillock.8.xml"> ++--> ++]> ++ ++<article> ++ ++ <articleinfo> ++ ++ <title> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="pam_faillock.8.xml" xpointer='xpointer(//refnamediv[@id = "pam_faillock-name"]/*)'/> ++ </title> ++ ++ </articleinfo> ++ ++ <section> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-description"]/*)'/> ++ </section> ++ ++ <section> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-options"]/*)'/> ++ </section> ++ ++ <section> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-notes"]/*)'/> ++ </section> ++ ++ <section> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-examples"]/*)'/> ++ </section> ++ ++ <section> ++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" ++ href="pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-author"]/*)'/> ++ </section> ++ ++</article> +diff -up Linux-PAM-1.1.1/modules/pam_faillock/tst-pam_faillock.faillock Linux-PAM-1.1.1/modules/pam_faillock/tst-pam_faillock +--- Linux-PAM-1.1.1/modules/pam_faillock/tst-pam_faillock.faillock 2010-09-17 15:58:41.000000000 +0200 ++++ Linux-PAM-1.1.1/modules/pam_faillock/tst-pam_faillock 2010-09-17 15:58:41.000000000 +0200 +@@ -0,0 +1,2 @@ ++#!/bin/sh ++../../tests/tst-dlopen .libs/pam_faillock.so diff --git a/extra/source/pam/patches/pam-1.1.2-noflex.patch b/extra/source/pam/patches/pam-1.1.2-noflex.patch new file mode 100644 index 000000000..fc965559b --- /dev/null +++ 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 = *~ diff --git a/extra/source/pam/patches/pam-1.1.3-faillock-screensaver.patch b/extra/source/pam/patches/pam-1.1.3-faillock-screensaver.patch new file mode 100644 index 000000000..249d2850c --- /dev/null +++ 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 diff --git a/extra/source/pam/patches/pam-1.1.3-limits-nosetreuid.patch b/extra/source/pam/patches/pam-1.1.3-limits-nosetreuid.patch new file mode 100644 index 000000000..885690d09 --- /dev/null +++ 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> diff --git a/extra/source/pam/patches/pam-1.1.3-limits-range.patch b/extra/source/pam/patches/pam-1.1.3-limits-range.patch new file mode 100644 index 000000000..c357eb282 --- /dev/null +++ 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><min_uid></replaceable><emphasis ++ remap='B'>:</emphasis><replaceable><max_uid></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><min_gid></replaceable><emphasis ++ remap='B'>:</emphasis><replaceable><max_gid></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><gid></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); diff --git a/extra/source/pam/patches/pam-1.1.3-nouserenv.patch b/extra/source/pam/patches/pam-1.1.3-nouserenv.patch new file mode 100644 index 000000000..f3a742c8d --- /dev/null +++ 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> diff --git a/extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch b/extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch new file mode 100644 index 000000000..6117b26ea --- /dev/null +++ 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; + } + + diff --git a/extra/source/pam/patches/pam-1.1.3-securetty-console.patch b/extra/source/pam/patches/pam-1.1.3-securetty-console.patch new file mode 100644 index 000000000..94fa6ecf0 --- /dev/null +++ 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); diff --git a/extra/source/pam/slack-desc b/extra/source/pam/slack-desc new file mode 100644 index 000000000..8b57bc0d6 --- /dev/null +++ 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: diff --git a/extra/source/slacktrack/slacktrack.SlackBuild b/extra/source/slacktrack/slacktrack.SlackBuild deleted file mode 100755 index ca2bd0932..000000000 --- a/extra/source/slacktrack/slacktrack.SlackBuild +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# Set initial variables: -CWD=`pwd` -if [ "$TMP" = "" ]; then - TMP=/tmp -fi - -export VERSION=2.07 -export PKGEXT=${PKGEXT:-txz} - -if [ ! -d $TMP ]; then - mkdir -p $TMP # location to build the source -fi -cd $TMP -rm -rf slacktrack -tar xvf $CWD/slacktrack-$VERSION-source.tar.gz -cd slacktrack - -# Start the "real" SlackBuild: -./slacktrack.SlackBuild diff --git a/extra/source/yasm/slack-desc b/extra/source/yasm/slack-desc deleted file mode 100644 index fc28253f2..000000000 --- a/extra/source/yasm/slack-desc +++ /dev/null @@ -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------------------------------------------------------| -yasm: yasm (complete rewrite of the NASM assembler) -yasm: -yasm: Yasm is a complete rewrite of the NASM assembler under the "new" BSD -yasm: License (some portions are under other licenses, see COPYING for -yasm: details). Yasm currently supports the x86 and AMD64 instruction sets, -yasm: accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, -yasm: 32 and 64-bit Mach-O, RDOFF2, COFF, Win32, and Win64 object formats, -yasm: and generates source debugging information in STABS, DWARF 2, and -yasm: CodeView 8 formats. -yasm: -yasm: yasm home: http://www.tortall.net/projects/yasm/ diff --git a/extra/source/yasm/yasm.SlackBuild b/extra/source/yasm/yasm.SlackBuild deleted file mode 100755 index 0c71cdae3..000000000 --- a/extra/source/yasm/yasm.SlackBuild +++ /dev/null @@ -1,204 +0,0 @@ -#!/bin/sh -# $Id: yasm.SlackBuild,v 1.7 2009/05/12 20:24:31 root Exp root $ -# Copyright (c) 2008 Eric Hameleers <alien@slackware.com> -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS 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. -# ----------------------------------------------------------------------------- -# -# Slackware SlackBuild script -# =========================== -# By: Eric Hameleers <alien@slackware.com> -# For: yasm -# Descr: complete rewrite of the NASM assembler -# URL: http://www.tortall.net/projects/yasm/ -# Needs: -# Changelog: -# 0.7.1-1: 16/Jun/2008 by Eric Hameleers <alien@slackware.com> -# * Initial build. -# 0.7.2-1: 08/dec/2008 by Eric Hameleers <alien@slackware.com> -# * Update. -# 0.8.0-1: 12/may/2009 by Eric Hameleers <alien@slackware.com> -# * Update. -# -# Run 'sh yasm.SlackBuild' to build a Slackware package. -# The package (.txz) plus descriptive .txt file are created in /tmp . -# Install using 'installpkg'. -# -# ----------------------------------------------------------------------------- - -PRGNAM=yasm -VERSION=${VERSION:-0.8.0} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} -TAG=${TAG:-} - -DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING GNU_* NEWS README *.txt" - -# If you want to disable python bindings, set ENABLE_PYTHON to "NO". -# Building python support on Slackware 12.0 and older will fail (missing Pyrex). -ENABLE_PYTHON=${ENABLE_PYTHON:-"YES"} - -# Where do we look for sources? -SRCDIR=$(cd $(dirname $0); pwd) - -# Place to build (TMP) package (PKG) and output (OUTPUT) the program: -TMP=${TMP:-/tmp/build} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz" -SRCURL="http://www.tortall.net/projects/${PRGNAM}/releases/${PRGNAM}-${VERSION}.tar.gz" - -## -## --- with a little luck, you won't have to edit below this point --- ## -## - -# Exit the script on errors: -set -e -trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR -# Catch unitialized variables: -set -u -P1=${1:-1} - -case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - s390) SLKCFLAGS="-O2" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - powerpc) SLKCFLAGS="-O2" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - x86_64) SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" - ;; - athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; -esac - -# Create working directories: -mkdir -p $OUTPUT # place for the package to be saved -mkdir -p $TMP/tmp-$PRGNAM # location to build the source -mkdir -p $PKG # place for the package to be built -rm -rf $PKG/* # always erase old package's contents -rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build - -# Source file availability: -if ! [ -f ${SOURCE} ]; then - if ! [ "x${SRCURL}" == "x" ]; then - # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT - [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" - echo "Source '$(basename ${SOURCE})' not available yet..." - echo "Will download file to $(dirname $SOURCE)" - wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true - if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then - echo "Downloading '$(basename ${SOURCE})' failed... aborting the build." - mv -f "${SOURCE}" "${SOURCE}".FAIL - exit 1 - fi - else - echo "File '$(basename ${SOURCE})' not available... aborting the build." - exit 1 - fi -fi - -if [ "$P1" == "--download" ]; then - echo "Download complete." - exit 0 -fi - -# --- PACKAGE BUILDING --- - -echo "++" -echo "|| $PRGNAM-$VERSION" -echo "++" - -cd $TMP/tmp-$PRGNAM -echo "Extracting the source archive(s) for $PRGNAM..." -tar -xvf ${SOURCE} -cd ${PRGNAM}-${VERSION} -chown -R root:root . -chmod -R u+w,go+r-w,a-s . - -if [ "$ENABLE_PYTHON" = "YES" ]; then - PYTHONSTUFF="--enable-python --enable-python-bindings" -else - PYTHONSTUFF="" -fi - -echo Building ... -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -./configure --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - ${PYTHONSTUFF} \ - --program-prefix= \ - --program-suffix= \ - --build=$ARCH-slackware-linux \ - 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log -make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log - -# Install all the needed stuff to the package dir -# Use installwatch if available, to produce a logfile of the installation -# process that is more easily readable: -if $(which installwatch > /dev/null 2>&1); then - installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install -else - make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log -fi - -# Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true -cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; - -# Remove empty share directory: -rmdir $PKG/usr/share || true - -# Compress the man page(s): -if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; - for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -fi - -# 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 - -# Add a package description: -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt - |