Import sfw build 128 sfwnv_128
authorCyril Plisko <cyril.plisko@grigale.com>
Sun, 20 Dec 2009 07:12:51 +0200
changeset 2 8f1801a322e9
parent 1 37d545eabfea
child 3 ad3552f8e1ef
Import sfw build 128 Bugs Fixed ---------- 6562055 FIPS-capable version of OpenSSL 6660998 include snmp support within php 6667232 [nvb79b] integrate mod-perl 2.0.4 6751764 Upgrade Subversion to 1.6.3 6818228 [nvb110] zlib functions are not working on sparc 6825797 php engine dumps core within gettext php test case 6835980 RFE: Integrate trove for StorageIM (fix build dependency) 6851099 Update mutt to version 1.5.20 (fix opensolaris build) 6864292 [nvb119] some JSP and SERVLET functional tests are failed (strict_servlet compliance) 6867572 acpidump to be included in SFW consolidation (fix incrementals) 6870491 A patch from sfw allows cdrecord to write any local file 6878859 Tomcat should create pid file for monitoring by other applications 6888690 TPM: The "tpmadm auth" command does not prompt user for PIN 6889305 emacs buffers menu is not updating in build 124 6889510 tomcat 6 is built with wrong version info 6890019 Tomcat packaging should better support custom ROOT web application deployment 6892088 memory leak in pam_pkcs11 pam_prompt() 6892736 Update GNU emacs to version 23.1 6893031 mod_sed consumes too much memory when used inside reverse proxy and line sizes are very long 6893192 Tomcat needs extra package for example web applications 6893884 warning thrown while loading xdebug extension 6893900 "tpmadm init" command causes core dump if verify PIN is incorrect 6893909 nanosleep function is not recognized in php 6895932 sox should not use /usr/lib/libgomp.so, even when the SFW build server has gcc installed 6896267 Wireshark update to version 1.2.3
usr/src/Targetdirs
usr/src/cmd/acpidump/Makefile.sfw
usr/src/cmd/apache2-modperl/CVE-2007-1349.patch
usr/src/cmd/apache2-modperl/METADATA
usr/src/cmd/apache2-modperl/Makefile.sfw
usr/src/cmd/apache2-modperl/Reload.patch
usr/src/cmd/apache2-modperl/mod_perl-2.0.2.tar.gz
usr/src/cmd/apache2-modperl/mod_perl-2.0.4.tar.gz
usr/src/cmd/apache2/modules/huge_mem_req_48024.patch
usr/src/cmd/apache2/modules/sed.mk
usr/src/cmd/cdrtools/Makefile.sfw
usr/src/cmd/cdrtools/cdrecord.c.patch
usr/src/cmd/emacs/METADATA
usr/src/cmd/emacs/Makefile.sfw
usr/src/cmd/emacs/augment/man/man1/b2m.1
usr/src/cmd/emacs/augment/man/man1/ebrowse.1
usr/src/cmd/emacs/augment/man/man1/grep-changelog.1
usr/src/cmd/emacs/augment/man/man1/rcs-checkin.1
usr/src/cmd/emacs/augment/patch/buffer_menu.patch
usr/src/cmd/emacs/augment/patch/config.guess.patch
usr/src/cmd/emacs/augment/patch/configure.patch
usr/src/cmd/emacs/augment/patch/dldump.patch
usr/src/cmd/emacs/augment/patch/gtkutil.patch
usr/src/cmd/emacs/augment/patch/sysmalloc.patch
usr/src/cmd/emacs/emacs-22.1.tar.gz
usr/src/cmd/emacs/emacs-23.1.tar.gz
usr/src/cmd/emacs/install-sfw
usr/src/cmd/emacs/tools/build_emacs
usr/src/cmd/mutt/Makefile.sfw
usr/src/cmd/php5/METADATA
usr/src/cmd/php5/Makefile.sfw
usr/src/cmd/php5/config/extensions/xdebug.ini
usr/src/cmd/php5/patches/php_6818228.patch
usr/src/cmd/php5/patches/php_6825797.patch
usr/src/cmd/sox/Makefile.sfw
usr/src/cmd/subversion/METADATA
usr/src/cmd/subversion/Makefile.sfw
usr/src/cmd/subversion/install-sfw
usr/src/cmd/subversion/subversion-1.4.3.patch
usr/src/cmd/subversion/subversion-1.4.3.tar.gz
usr/src/cmd/subversion/subversion-1.6.5-py26.patch
usr/src/cmd/subversion/subversion-1.6.5.patch
usr/src/cmd/subversion/subversion-1.6.5.tar.gz
usr/src/cmd/subversion/sunman.sed
usr/src/cmd/subversion/sunman/svn.1.sunman
usr/src/cmd/subversion/sunman/svnadmin.1.sunman
usr/src/cmd/subversion/sunman/svndumpfilter.1.sunman
usr/src/cmd/subversion/sunman/svnlook.1.sunman
usr/src/cmd/subversion/sunman/svnserve.8.sunman
usr/src/cmd/subversion/sunman/svnserve.conf.5.sunman
usr/src/cmd/subversion/sunman/svnsync.1.sunman
usr/src/cmd/subversion/sunman/svnversion.1.sunman
usr/src/cmd/tomcat/METADATA
usr/src/cmd/tomcat/Patches/tomcat_strict_servlet.patch
usr/src/cmd/tomcat/Solaris/http-tomcat6
usr/src/cmd/tomcat/Solaris/index.jsp
usr/src/cmd/tomcat/Solaris/tomcat.1m.sunman
usr/src/cmd/tomcat/build.properties.in
usr/src/cmd/tomcat/install-tomcat
usr/src/cmd/wireshark/METADATA
usr/src/cmd/wireshark/wireshark-1.2.2.tar.bz2
usr/src/cmd/wireshark/wireshark-1.2.3.tar.bz2
usr/src/lib/Makefile
usr/src/lib/libneon/METADATA
usr/src/lib/libneon/Makefile.sfw
usr/src/lib/libneon/install-sfw
usr/src/lib/libneon/install-sfw-64
usr/src/lib/libneon/neon-0.25.5.tar.gz
usr/src/lib/libneon/neon-0.29.0.tar.gz
usr/src/lib/openssl/Makefile.com
usr/src/lib/openssl/Makefile.sfw
usr/src/lib/openssl/Patches/24-6850304.patch
usr/src/lib/openssl/Patches/25-6881996.patch
usr/src/lib/openssl/Patches/25-fips_rand.patch
usr/src/lib/openssl/Patches/26-openssl_fips.patch
usr/src/lib/openssl/Patches/i386_01-mapfile.patch
usr/src/lib/openssl/Patches/x86_32-01-mapfile.patch
usr/src/lib/openssl/README
usr/src/lib/openssl/crypto.mapfile
usr/src/lib/openssl/fips/Makefile.sfw
usr/src/lib/openssl/fips/ccwrap.sh
usr/src/lib/openssl/fips/crypto-amd64.mapfile
usr/src/lib/openssl/fips/crypto.mapfile
usr/src/lib/openssl/fips/install-sfw
usr/src/lib/openssl/fips/install-sfw-64
usr/src/lib/openssl/fips/openssl-fips/32/isalist.sh
usr/src/lib/openssl/fips/openssl-fips/METADATA
usr/src/lib/openssl/fips/openssl-fips/Makefile.sfw
usr/src/lib/openssl/fips/openssl-fips/make.sh
usr/src/lib/openssl/fips/openssl-fips/openssl-fips-1.2.tar.gz
usr/src/lib/openssl/fips/sparc-01-ccwrap.patch
usr/src/lib/openssl/fips/x86_64-01-mapfile.patch
usr/src/lib/openssl/install-sfw
usr/src/lib/openssl/install-sfw-64
usr/src/lib/openssl/llib-lcrypto
usr/src/lib/openssl/llib-lssl
usr/src/lib/openssl/non-fips/Makefile.sfw
usr/src/lib/openssl/non-fips/crypto.mapfile
usr/src/lib/openssl/non-fips/install-sfw
usr/src/lib/openssl/non-fips/install-sfw-64
usr/src/lib/openssl/non-fips/llib-lcrypto
usr/src/lib/openssl/non-fips/llib-lssl
usr/src/lib/pam_pkcs11/pam_pkcs11.patch
usr/src/lib/trousers/Patches/tsp_changeauth.c.patch
usr/src/lib/trousers/Patches/tsp_policy.c.patch
usr/src/pkgdefs/Makefile
usr/src/pkgdefs/SUNWapch22d/prototype_com
usr/src/pkgdefs/SUNWapch22u/prototype_com
usr/src/pkgdefs/SUNWgnu-emacs-el/copyright
usr/src/pkgdefs/SUNWgnu-emacs-el/pkginfo.tmpl
usr/src/pkgdefs/SUNWgnu-emacs-el/prototype_com
usr/src/pkgdefs/SUNWgnu-emacs-gtk/copyright
usr/src/pkgdefs/SUNWgnu-emacs-gtk/depend
usr/src/pkgdefs/SUNWgnu-emacs-gtk/pkginfo.tmpl
usr/src/pkgdefs/SUNWgnu-emacs-gtk/prototype_com
usr/src/pkgdefs/SUNWgnu-emacs-gtk/prototype_i386
usr/src/pkgdefs/SUNWgnu-emacs-gtk/prototype_sparc
usr/src/pkgdefs/SUNWgnu-emacs-nox/copyright
usr/src/pkgdefs/SUNWgnu-emacs-nox/depend
usr/src/pkgdefs/SUNWgnu-emacs-nox/pkginfo.tmpl
usr/src/pkgdefs/SUNWgnu-emacs-nox/prototype_com
usr/src/pkgdefs/SUNWgnu-emacs-nox/prototype_i386
usr/src/pkgdefs/SUNWgnu-emacs-nox/prototype_sparc
usr/src/pkgdefs/SUNWgnu-emacs-x/copyright
usr/src/pkgdefs/SUNWgnu-emacs-x/depend
usr/src/pkgdefs/SUNWgnu-emacs-x/pkginfo.tmpl
usr/src/pkgdefs/SUNWgnu-emacs-x/prototype_com
usr/src/pkgdefs/SUNWgnu-emacs-x/prototype_i386
usr/src/pkgdefs/SUNWgnu-emacs-x/prototype_sparc
usr/src/pkgdefs/SUNWgnu-emacs/copyright
usr/src/pkgdefs/SUNWgnu-emacs/depend
usr/src/pkgdefs/SUNWgnu-emacs/pkginfo.tmpl
usr/src/pkgdefs/SUNWgnu-emacs/prototype_com
usr/src/pkgdefs/SUNWgnu-emacs/prototype_i386.tmpl
usr/src/pkgdefs/SUNWgnu-emacs/prototype_sparc.tmpl
usr/src/pkgdefs/SUNWneon/depend
usr/src/pkgdefs/SUNWneon/pkginfo.tmpl
usr/src/pkgdefs/SUNWneon/prototype_com
usr/src/pkgdefs/SUNWneon/prototype_i386
usr/src/pkgdefs/SUNWneon/prototype_sparc
usr/src/pkgdefs/SUNWopenssl-fips-140-include/Makefile
usr/src/pkgdefs/SUNWopenssl-fips-140-include/copyright
usr/src/pkgdefs/SUNWopenssl-fips-140-include/depend
usr/src/pkgdefs/SUNWopenssl-fips-140-include/pkginfo.tmpl
usr/src/pkgdefs/SUNWopenssl-fips-140-include/prototype_com
usr/src/pkgdefs/SUNWopenssl-fips-140-include/prototype_i386
usr/src/pkgdefs/SUNWopenssl-fips-140-include/prototype_sparc
usr/src/pkgdefs/SUNWopenssl-fips-140/Makefile
usr/src/pkgdefs/SUNWopenssl-fips-140/copyright
usr/src/pkgdefs/SUNWopenssl-fips-140/pkginfo.tmpl
usr/src/pkgdefs/SUNWopenssl-fips-140/prototype_com
usr/src/pkgdefs/SUNWopenssl-fips-140/prototype_i386
usr/src/pkgdefs/SUNWopenssl-fips-140/prototype_sparc
usr/src/pkgdefs/SUNWphp52r/prototype_com
usr/src/pkgdefs/SUNWphp52u/depend
usr/src/pkgdefs/SUNWphp52u/prototype_com
usr/src/pkgdefs/SUNWsvn-python/depend
usr/src/pkgdefs/SUNWsvn-python/prototype_com
usr/src/pkgdefs/SUNWsvn/pkginfo.tmpl
usr/src/pkgdefs/SUNWsvn/prototype_com
usr/src/pkgdefs/SUNWtcat-examples/Makefile
usr/src/pkgdefs/SUNWtcat-examples/copyright
usr/src/pkgdefs/SUNWtcat-examples/depend
usr/src/pkgdefs/SUNWtcat-examples/pkginfo.tmpl
usr/src/pkgdefs/SUNWtcat-examples/prototype_com
usr/src/pkgdefs/SUNWtcat-examples/prototype_i386
usr/src/pkgdefs/SUNWtcat-examples/prototype_sparc
usr/src/pkgdefs/SUNWtcatr/prototype_com
usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl
usr/src/pkgdefs/SUNWwireshark/prototype_com
--- a/usr/src/Targetdirs	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/Targetdirs	Sun Dec 20 07:12:51 2009 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)Targetdirs	1.239	09/10/22 SMI"
+# ident	"@(#)Targetdirs	1.242	09/11/05 SMI"
 #
 
 #
@@ -56,12 +56,12 @@
 
 i386_ROOT.BIN= \
 	/lib/$(MACH64) \
-	/usr/lib/emacs/22.1/i386-pc-solaris$(SOL_REV) \
+	/usr/lib/emacs/23.1/i386-pc-solaris$(SOL_REV) \
 	/usr/sbin/$(MACH32)
 
 sparc_ROOT.BIN= \
 	/lib/$(MACH64) \
-	/usr/lib/emacs/22.1/sparc-sun-solaris$(SOL_REV)
+	/usr/lib/emacs/23.1/sparc-sun-solaris$(SOL_REV)
 
 ROOT.SYS=  \
 	/etc \
@@ -294,7 +294,7 @@
 	/usr/lib/conman/examples \
 	/usr/lib/conman/exec \
 	/usr/lib/emacs \
-	/usr/lib/emacs/22.1 \
+	/usr/lib/emacs/23.1 \
 	/usr/lib/ejabberd \
 	/usr/lib/erlang \
 	/usr/lib/gutenprint \
@@ -372,6 +372,7 @@
 	/usr/lib/python2.6/vendor-packages/OpenSSL \
 	/usr/lib/python2.6/vendor-packages/OpenSSL/64 \
 	/usr/lib/python2.6/vendor-packages/OpenSSL/test \
+	/usr/lib/python2.6/vendor-packages/libsvn \
 	/usr/lib/python2.6/vendor-packages/logilab \
 	/usr/lib/python2.6/vendor-packages/logilab/common \
 	/usr/lib/python2.6/vendor-packages/logilab/common/test \
@@ -407,6 +408,7 @@
 	/usr/lib/python2.6/vendor-packages/pylint/reporters \
 	/usr/lib/python2.6/vendor-packages/pylint/checkers \
 	/usr/lib/python2.6/vendor-packages/pylint-0.18.0-py2.6.egg-info \
+	/usr/lib/python2.6/vendor-packages/svn \
 	/usr/lib/quilt \
 	/usr/lib/sane \
 	/usr/lib/security \
@@ -970,7 +972,7 @@
 	/usr/share/doc/mpfr \
 	/usr/share/doc/mpfr/html \
 	/usr/share/doc/mvel \
-	/usr/share/doc/neon-0.25.5/html \
+	/usr/share/doc/neon-0.29.0/html \
 	/usr/share/doc/ntp \
 	/usr/share/doc/ntp/description_files \
 	/usr/share/doc/ntp/drivers \
@@ -1023,43 +1025,68 @@
 	/usr/share/doc/yaz \
 	/usr/share/doc/yaz/common \
 	/usr/share/emacs \
-	/usr/share/emacs/22.1 \
-	/usr/share/emacs/22.1/etc \
-	/usr/share/emacs/22.1/etc/e \
-	/usr/share/emacs/22.1/etc/images \
-	/usr/share/emacs/22.1/etc/images/ezimage \
-	/usr/share/emacs/22.1/etc/images/gnus \
-	/usr/share/emacs/22.1/etc/images/gud \
-	/usr/share/emacs/22.1/etc/images/icons \
-	/usr/share/emacs/22.1/etc/images/low-color \
-	/usr/share/emacs/22.1/etc/images/mail \
-	/usr/share/emacs/22.1/etc/images/smilies \
-	/usr/share/emacs/22.1/etc/tree-widget \
-	/usr/share/emacs/22.1/etc/tree-widget/default \
-	/usr/share/emacs/22.1/etc/tree-widget/folder \
-	/usr/share/emacs/22.1/leim \
-	/usr/share/emacs/22.1/leim/ja-dic \
-	/usr/share/emacs/22.1/leim/quail \
-	/usr/share/emacs/22.1/lisp \
-	/usr/share/emacs/22.1/lisp/calc \
-	/usr/share/emacs/22.1/lisp/calendar \
-	/usr/share/emacs/22.1/lisp/emacs-lisp \
-	/usr/share/emacs/22.1/lisp/emulation \
-	/usr/share/emacs/22.1/lisp/erc \
-	/usr/share/emacs/22.1/lisp/eshell \
-	/usr/share/emacs/22.1/lisp/gnus \
-	/usr/share/emacs/22.1/lisp/international \
-	/usr/share/emacs/22.1/lisp/language \
-	/usr/share/emacs/22.1/lisp/mail \
-	/usr/share/emacs/22.1/lisp/mh-e \
-	/usr/share/emacs/22.1/lisp/net \
-	/usr/share/emacs/22.1/lisp/obsolete \
-	/usr/share/emacs/22.1/lisp/play \
-	/usr/share/emacs/22.1/lisp/progmodes \
-	/usr/share/emacs/22.1/lisp/term \
-	/usr/share/emacs/22.1/lisp/textmodes \
-	/usr/share/emacs/22.1/lisp/url \
-	/usr/share/emacs/22.1/site-lisp \
+	/usr/share/emacs/23.1 \
+	/usr/share/emacs/23.1/etc \
+	/usr/share/emacs/23.1/etc/charsets \
+	/usr/share/emacs/23.1/etc/e \
+	/usr/share/emacs/23.1/etc/gnus \
+	/usr/share/emacs/23.1/etc/images \
+	/usr/share/emacs/23.1/etc/images/custom \
+	/usr/share/emacs/23.1/etc/images/ezimage \
+	/usr/share/emacs/23.1/etc/images/gnus \
+	/usr/share/emacs/23.1/etc/images/gud \
+	/usr/share/emacs/23.1/etc/images/icons \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/128x128 \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/128x128/apps \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/16x16 \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/16x16/apps \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/24x24 \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/24x24/apps \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/32x32 \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/32x32/apps \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/48x48 \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/48x48/apps \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/scalable \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/scalable/apps \
+	/usr/share/emacs/23.1/etc/images/icons/hicolor/scalable/mimetypes \
+	/usr/share/emacs/23.1/etc/images/low-color \
+	/usr/share/emacs/23.1/etc/images/mail \
+	/usr/share/emacs/23.1/etc/images/smilies \
+	/usr/share/emacs/23.1/etc/images/smilies/grayscale \
+	/usr/share/emacs/23.1/etc/images/smilies/medium \
+	/usr/share/emacs/23.1/etc/images/tree-widget \
+	/usr/share/emacs/23.1/etc/images/tree-widget/default \
+	/usr/share/emacs/23.1/etc/images/tree-widget/folder \
+	/usr/share/emacs/23.1/etc/nxml \
+	/usr/share/emacs/23.1/etc/refcards \
+	/usr/share/emacs/23.1/etc/schema \
+	/usr/share/emacs/23.1/etc/tutorials \
+	/usr/share/emacs/23.1/leim \
+	/usr/share/emacs/23.1/leim/ja-dic \
+	/usr/share/emacs/23.1/leim/quail \
+	/usr/share/emacs/23.1/lisp \
+	/usr/share/emacs/23.1/lisp/calc \
+	/usr/share/emacs/23.1/lisp/calendar \
+	/usr/share/emacs/23.1/lisp/emacs-lisp \
+	/usr/share/emacs/23.1/lisp/emulation \
+	/usr/share/emacs/23.1/lisp/erc \
+	/usr/share/emacs/23.1/lisp/eshell \
+	/usr/share/emacs/23.1/lisp/gnus \
+	/usr/share/emacs/23.1/lisp/international \
+	/usr/share/emacs/23.1/lisp/language \
+	/usr/share/emacs/23.1/lisp/mail \
+	/usr/share/emacs/23.1/lisp/mh-e \
+	/usr/share/emacs/23.1/lisp/net \
+	/usr/share/emacs/23.1/lisp/nxml \
+	/usr/share/emacs/23.1/lisp/obsolete \
+	/usr/share/emacs/23.1/lisp/org \
+	/usr/share/emacs/23.1/lisp/play \
+	/usr/share/emacs/23.1/lisp/progmodes \
+	/usr/share/emacs/23.1/lisp/term \
+	/usr/share/emacs/23.1/lisp/textmodes \
+	/usr/share/emacs/23.1/lisp/url \
+	/usr/share/emacs/23.1/site-lisp \
 	/usr/share/emacs/site-lisp \
 	/usr/share/gutenprint \
 	/usr/share/gutenprint/5.2 \
@@ -1104,8 +1131,22 @@
 	/usr/share/idzebra-2.0-examples/oai-pmh/conf \
 	/usr/share/idzebra-2.0-examples/oai-pmh/data \
 	/usr/share/idzebra-2.0/tab \
+	/usr/share/icons \
 	/usr/share/icons/hicolor \
-	/usr/share/info \
+	/usr/share/icons/hicolor/128x128 \
+	/usr/share/icons/hicolor/128x128/apps \
+	/usr/share/icons/hicolor/16x16 \
+	/usr/share/icons/hicolor/16x16/apps \
+	/usr/share/icons/hicolor/24x24 \
+	/usr/share/icons/hicolor/24x24/apps \
+	/usr/share/icons/hicolor/32x32 \
+	/usr/share/icons/hicolor/32x32/apps \
+	/usr/share/icons/hicolor/48x48 \
+	/usr/share/icons/hicolor/48x48/apps \
+	/usr/share/icons/hicolor/scalable \
+	/usr/share/icons/hicolor/scalable/apps \
+	/usr/share/icons/hicolor/scalable/mimetypes \
+ 	/usr/share/info \
 	/usr/share/irc \
 	/usr/share/irc/help \
 	/usr/share/irc/script \
@@ -1135,20 +1176,24 @@
 	/usr/share/man/man1m \
 	/usr/share/man/man1t \
 	/usr/share/man/man1oldap \
+	/usr/share/man/man1openssl \
 	/usr/share/man/man3 \
 	/usr/share/man/man3erl \
 	/usr/share/man/man3libmemcached \
 	/usr/share/man/man3lib \
 	/usr/share/man/man3oldap \
+	/usr/share/man/man3openssl \
 	/usr/share/man/man3smartcard \
 	/usr/share/man/man3tcl \
 	/usr/share/man/man3tk \
 	/usr/share/man/man4 \
 	/usr/share/man/man4erl \
 	/usr/share/man/man5 \
+	/usr/share/man/man5openssl \
 	/usr/share/man/man5oldap \
 	/usr/share/man/man6 \
 	/usr/share/man/man7 \
+	/usr/share/man/man7openssl \
 	/usr/share/man/man8 \
 	/usr/share/meld \
 	/usr/share/meld/glade2 \
--- a/usr/src/cmd/acpidump/Makefile.sfw	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/acpidump/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -23,19 +23,25 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)Makefile.sfw	1.1	09/10/26 SMI"
+#ident	"@(#)Makefile.sfw	1.2	09/11/03 SMI"
 #
 
-VER =		$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
-
 include ../Makefile.cmd
 
-all: $(VER)
+VER =		$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
+TARBALL=$(VER).tar.gz
+PATCHES= Patches/pmtools-01.patch
+GPATCH_FLAGS=	-p1
+
+all: $(VER)/.patched
 	(cd $(VER); env - MAKE=$(GMAKE) CC=$(GCC) $(GMAKE))
 
 install: install-protofix
 
 install-target: all
+	for pkg in $(COMPONENT_PACKAGES:sh) ; do \
+		$(SRC)/tools/protofix --pkg $$pkg --perm --write ; \
+	done
 	(cd $(VER); env - MAKE=$(GMAKE) DESTDIR=$(ROOTBIN) $(GMAKE) install)
 	$(SHELL) ./install-sfw
 
@@ -45,11 +51,6 @@
 	done
 
 
-$(VER): $(VER).tar.gz
-	gzip -d $(VER).tar.gz; $(TAR) oxpf $(VER).tar
-	$(GPATCH) -p0 $(VER)/acpidump/acpidump.c Patches/pmtools-01.patch
-	gzip $(VER).tar
-
 clean:
 	-$(RM) -r $(VER)
 
--- a/usr/src/cmd/apache2-modperl/CVE-2007-1349.patch	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- mod_perl-2.0.2/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm.cve1349
-+++ mod_perl-2.0.2/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
-@@ -336,7 +336,7 @@
-     my $self = shift;
- 
-     my $path_info = $self->{REQ}->path_info;
--    my $script_name = $path_info && $self->{URI} =~ /$path_info$/
-+    my $script_name = $path_info && $self->{URI} =~ /\Q$path_info\E$/
-         ? substr($self->{URI}, 0, length($self->{URI}) - length($path_info))
-         : $self->{URI};
- 
--- a/usr/src/cmd/apache2-modperl/METADATA	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/apache2-modperl/METADATA	Sun Dec 20 07:12:51 2009 +0200
@@ -1,10 +1,10 @@
 NAME:             mod_perl
-VERSION:          2.0.2
+VERSION:          2.0.4
 DESCRIPTION:      Apache web server perl module
 LICENSE:          Apache
 PACKAGE:          SUNWapch22u
 PROJECT_URL:      http://perl.apache.org/
-SOURCE_DOWNLOAD:  http://perl.apache.org/dist/mod_perl-2.0.2.tar.gz
+SOURCE_DOWNLOAD:  http://perl.apache.org/dist/mod_perl-2.0.4.tar.gz
 SUPPORT:          Managed
 BUGTRAQ:          solaris/utility/apache
 OSR:              10135
--- a/usr/src/cmd/apache2-modperl/Makefile.sfw	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/apache2-modperl/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -22,9 +22,9 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.sfw	1.20	09/08/20 SMI"
+#ident	"@(#)Makefile.sfw	1.21	09/10/20 SMI"
 
-VER=mod_perl-2.0.2
+VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
 
 PERL=/usr/perl5/bin/perl
 
@@ -143,8 +143,9 @@
 
 $(VER)/Makefile.PL: $(VER).tar.gz
 	gzip -dc $(VER).tar.gz | tar xopf -
-	gpatch -p0 < CVE-2007-1349.patch
-	gpatch -p0 < CVE-2009-0796.patch
+	(cd $(VER); gpatch -p1 --no-backup-if-mismatch < ../CVE-2009-0796.patch)
+	touch $(VER)/lib/Apache2/Reload.pm
+	gpatch -p0 < Reload.patch
 	touch $(VER)/Makefile.PL
 
 clean:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/apache2-modperl/Reload.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,571 @@
+--- /dev/null	Fri Oct 16 06:02:02 2009
++++ mod_perl-2.0.4/lib/Apache2/Reload.pm	Sun Nov 19 15:31:40 2006
+@@ -1,0 +1,185 @@
++# Licensed to the Apache Software Foundation (ASF) under one or more
++# contributor license agreements.  See the NOTICE file distributed with
++# this work for additional information regarding copyright ownership.
++# The ASF licenses this file to You 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.
++#
++package Apache2::Reload;
++
++use strict;
++use warnings FATAL => 'all';
++
++use mod_perl2;
++
++our $VERSION = '0.09';
++
++use Apache2::Const -compile => qw(OK);
++
++use Apache2::Connection;
++use Apache2::ServerUtil;
++use Apache2::RequestUtil;
++
++use ModPerl::Util ();
++
++use vars qw(%INCS %Stat $TouchTime);
++
++%Stat = ($INC{"Apache2/Reload.pm"} => time);
++
++$TouchTime = time;
++
++sub import {
++    my $class = shift;
++    my ($package, $file) = (caller)[0,1];
++
++    $class->register_module($package, $file);
++}
++
++sub package_to_module {
++    my $package = shift;
++    $package =~ s/::/\//g;
++    $package .= ".pm";
++    return $package;
++}
++
++sub module_to_package {
++    my $module = shift;
++    $module =~ s/\//::/g;
++    $module =~ s/\.pm$//g;
++    return $module;
++}
++
++sub register_module {
++    my ($class, $package, $file) = @_;
++    my $module = package_to_module($package);
++
++    if ($file) {
++        $INCS{$module} = $file;
++    }
++    else {
++        $file = $INC{$module};
++        return unless $file;
++        $INCS{$module} = $file;
++    }
++}
++
++sub unregister_module {
++    my ($class, $package) = @_;
++    my $module = package_to_module($package);
++    delete $INCS{$module};
++}
++
++# the first argument is:
++# $c if invoked as 'PerlPreConnectionHandler'
++# $r if invoked as 'PerlInitHandler'
++sub handler {
++    my $o = shift;
++    $o = $o->base_server if ref($o) eq 'Apache2::Connection';
++
++    my $DEBUG = ref($o) && (lc($o->dir_config("ReloadDebug") || '') eq 'on');
++
++    my $TouchFile = ref($o) && $o->dir_config("ReloadTouchFile");
++
++    my $ConstantRedefineWarnings = ref($o) && 
++        (lc($o->dir_config("ReloadConstantRedefineWarnings") || '') eq 'off') 
++            ? 0 : 1;
++
++    my $TouchModules;
++
++    if ($TouchFile) {
++        warn "Checking mtime of $TouchFile\n" if $DEBUG;
++        my $touch_mtime = (stat $TouchFile)[9] || return Apache2::Const::OK;
++        return Apache2::Const::OK unless $touch_mtime > $TouchTime;
++        $TouchTime = $touch_mtime;
++        open my $fh, $TouchFile or die "Can't open '$TouchFile': $!";
++        $TouchModules = <$fh>;
++        chomp $TouchModules if $TouchModules;
++    }
++
++    if (ref($o) && (lc($o->dir_config("ReloadAll") || 'on') eq 'on')) {
++        *Apache2::Reload::INCS = \%INC;
++    }
++    else {
++        *Apache2::Reload::INCS = \%INCS;
++        my $ExtraList = 
++                $TouchModules || 
++                (ref($o) && $o->dir_config("ReloadModules")) || 
++                '';
++        my @extra = split /\s+/, $ExtraList;
++        foreach (@extra) {
++            if (/(.*)::\*$/) {
++                my $prefix = $1;
++                $prefix =~ s/::/\//g;
++                foreach my $match (keys %INC) {
++                    if ($match =~ /^\Q$prefix\E/) {
++                        $Apache2::Reload::INCS{$match} = $INC{$match};
++                    }
++                }
++            }
++            else {
++                Apache2::Reload->register_module($_);
++            }
++        }
++    }
++
++    my $ReloadDirs = ref($o) && $o->dir_config("ReloadDirectories");
++    my @watch_dirs = split(/\s+/, $ReloadDirs||'');
++    
++    my @changed;
++    foreach my $key (sort { $a cmp $b } keys %Apache2::Reload::INCS) {
++        my $file = $Apache2::Reload::INCS{$key};
++
++        next unless defined $file;
++        next if @watch_dirs && !grep { $file =~ /^$_/ } @watch_dirs;
++        warn "Apache2::Reload: Checking mtime of $key\n" if $DEBUG;
++
++        my $mtime = (stat $file)[9];
++
++        unless (defined($mtime) && $mtime) {
++            for (@INC) {
++                $mtime = (stat "$_/$file")[9];
++                last if defined($mtime) && $mtime;
++            }
++        }
++
++        warn("Apache2::Reload: Can't locate $file\n"), next
++            unless defined $mtime and $mtime;
++
++        unless (defined $Stat{$file}) {
++            $Stat{$file} = $^T;
++        }
++
++        if ($mtime > $Stat{$file}) {
++            push @changed, $key;
++        }
++        $Stat{$file} = $mtime;
++    }
++    
++    #First, let's unload all changed modules
++    foreach my $module (@changed) {
++        my $package = module_to_package($module);
++        ModPerl::Util::unload_package($package);
++    }
++    
++    #Then, let's reload them all, so that module dependencies can satisfy
++    #themselves in the correct order.
++    foreach my $module (@changed) {
++        my $package = module_to_package($module);
++        require $module;
++        warn("Apache2::Reload: process $$ reloading $package from $module\n")
++            if $DEBUG;
++    }
++
++    return Apache2::Const::OK;
++}
++
++1;
++__END__
+--- /dev/null	Fri Oct 16 06:02:02 2009
++++ mod_perl-2.0.4/docs/api/Apache2/Reload.pod	Sun Nov 19 15:32:13 2006
+@@ -1,0 +1,380 @@
++=head1 NAME
++
++Apache2::Reload - Reload Perl Modules when Changed on Disk
++
++=head1 Synopsis
++
++  # Monitor and reload all modules in %INC:
++  # httpd.conf:
++  PerlModule Apache2::Reload
++  PerlInitHandler Apache2::Reload
++
++  # when working with protocols and connection filters
++  # PerlPreConnectionHandler Apache2::Reload
++
++  # Reload groups of modules:
++  # httpd.conf:
++  PerlModule Apache2::Reload
++  PerlInitHandler Apache2::Reload
++  PerlSetVar ReloadAll Off
++  PerlSetVar ReloadModules "ModPerl::* Apache2::*"
++  #PerlSetVar ReloadDebug On
++  
++  # Reload a single module from within itself:
++  package My::Apache2::Module;
++  use Apache2::Reload;
++  sub handler { ... }
++  1;
++
++=head1 Description
++
++C<Apache2::Reload> reloads modules that change on the disk.
++
++When Perl pulls a file via C<require>, it stores the filename in the
++global hash C<%INC>.  The next time Perl tries to C<require> the same
++file, it sees the file in C<%INC> and does not reload from disk.  This
++module's handler can be configured to iterate over the modules in
++C<%INC> and reload those that have changed on disk or only specific
++modules that have registered themselves with C<Apache2::Reload>. It can
++also do the check for modified modules, when a special touch-file has
++been modified.
++
++Note that C<Apache2::Reload> operates on the current context of
++C<@INC>.  Which means, when called as a C<Perl*Handler> it will not
++see C<@INC> paths added or removed by C<ModPerl::Registry> scripts, as
++the value of C<@INC> is saved on server startup and restored to that
++value after each request.  In other words, if you want
++C<Apache2::Reload> to work with modules that live in custom C<@INC>
++paths, you should modify C<@INC> when the server is started.  Besides,
++C<'use lib'> in the startup script, you can also set the C<PERL5LIB>
++variable in the httpd's environment to include any non-standard 'lib'
++directories that you choose.  For example, to accomplish that you can
++include a line:
++
++  PERL5LIB=/home/httpd/perl/extra; export PERL5LIB
++
++in the script that starts Apache. Alternatively, you can set this
++environment variable in I<httpd.conf>:
++
++  PerlSetEnv PERL5LIB /home/httpd/perl/extra
++
++=head2 Monitor All Modules in C<%INC>
++
++To monitor and reload all modules in C<%INC> at the beginning of
++request's processing, simply add the following configuration to your
++I<httpd.conf>:
++
++  PerlModule Apache2::Reload
++  PerlInitHandler Apache2::Reload
++
++When working with connection filters and protocol modules
++C<Apache2::Reload> should be invoked in the pre_connection stage:
++
++  PerlPreConnectionHandler Apache2::Reload
++
++See also the discussion on
++C<L<PerlPreConnectionHandler|docs::2.0::user::handlers::protocols/PerlPreConnectionHandler>>.
++
++=head2 Register Modules Implicitly
++
++To only reload modules that have registered with C<Apache2::Reload>,
++add the following to the I<httpd.conf>:
++
++  PerlModule Apache2::Reload
++  PerlInitHandler Apache2::Reload
++  PerlSetVar ReloadAll Off
++  # ReloadAll defaults to On
++
++Then any modules with the line:
++
++  use Apache2::Reload;
++
++Will be reloaded when they change.
++
++=head2 Register Modules Explicitly
++
++You can also register modules explicitly in your I<httpd.conf> file
++that you want to be reloaded on change:
++
++  PerlModule Apache2::Reload
++  PerlInitHandler Apache2::Reload
++  PerlSetVar ReloadAll Off
++  PerlSetVar ReloadModules "My::Foo My::Bar Foo::Bar::Test"
++
++Note that these are split on whitespace, but the module list B<must>
++be in quotes, otherwise Apache tries to parse the parameter list.
++
++The C<*> wild character can be used to register groups of files under
++the same namespace. For example the setting:
++
++  PerlSetVar ReloadModules "ModPerl::* Apache2::*"
++
++will monitor all modules under the namespaces C<ModPerl::> and
++C<Apache2::>.
++
++=head2 Monitor Only Certain Sub Directories
++
++To reload modules only in certain directories (and their
++subdirectories) add the following to the I<httpd.conf>:
++
++  PerlModule Apache2::Reload
++  PerlInitHandler Apache2::Reload
++  PerlSetVar ReloadDirectories "/tmp/project1 /tmp/project2"
++
++You can further narrow the list of modules to be reloaded from the
++chosen directories with C<ReloadModules> as in:
++
++  PerlModule Apache2::Reload
++  PerlInitHandler Apache2::Reload
++  PerlSetVar ReloadDirectories "/tmp/project1 /tmp/project2"
++  PerlSetVar ReloadAll Off
++  PerlSetVar ReloadModules "MyApache2::*"
++
++In this configuration example only modules from the namespace
++C<MyApache2::> found in the directories I</tmp/project1/> and
++I</tmp/project2/> (and their subdirectories) will be reloaded.
++
++=head2 Special "Touch" File
++
++You can also declare a file, which when gets C<touch(1)>ed, causes the
++reloads to be performed. For example if you set:
++
++  PerlSetVar ReloadTouchFile /tmp/reload_modules
++
++and don't C<touch(1)> the file I</tmp/reload_modules>, the reloads
++won't happen until you go to the command line and type:
++
++  % touch /tmp/reload_modules
++
++When you do that, the modules that have been changed, will be
++magically reloaded on the next request. This option works with any
++mode described before.
++
++=head2 Unregistering a module
++
++In some cases, it might be necessary to explicitely stop reloading
++a module.
++
++  Apache2::Reload->unregister_module('Some::Module');
++
++But be carefull, since unregistering a module in this way will only
++do so for the current interpreter. This feature should be used with
++care.
++
++=head1 Performance Issues
++
++This module is perfectly suited for a development environment. Though
++it's possible that you would like to use it in a production
++environment, since with C<Apache2::Reload> you don't have to restart
++the server in order to reload changed modules during software
++updates. Though this convenience comes at a price:
++
++=over
++
++=item *
++
++If the "touch" file feature is used, C<Apache2::Reload> has to stat(2)
++the touch file on each request, which adds a slight but most likely
++insignificant overhead to response times. Otherwise C<Apache2::Reload>
++will stat(2) each registered module or even worse--all modules in
++C<%INC>, which will significantly slow everything down.
++
++=item *
++
++Once the child process reloads the modules, the memory used by these
++modules is not shared with the parent process anymore. Therefore the
++memory consumption may grow significantly.
++
++=back
++
++Therefore doing a full server stop and restart is probably a better
++solution.
++
++=head1 Debug
++
++If you aren't sure whether the modules that are supposed to be
++reloaded, are actually getting reloaded, turn the debug mode on:
++
++  PerlSetVar ReloadDebug On
++
++=head1 Caveats
++
++=head2 Problems With Reloading Modules Which Do Not Declare Their Package Name
++
++If you modify modules, which don't declare their C<package>, and rely on
++C<Apache2::Reload> to reload them, you may encounter problems: i.e.,
++it'll appear as if the module wasn't reloaded when in fact it
++was. This happens because when C<Apache2::Reload> C<require()>s such a
++module all the global symbols end up in the C<Apache2::Reload>
++namespace!  So the module does get reloaded and you see the compile
++time errors if there are any, but the symbols don't get imported to
++the right namespace. Therefore the old version of the code is running.
++
++
++=head2 Failing to Find a File to Reload
++
++C<Apache2::Reload> uses C<%INC> to find the files on the filesystem. If
++an entry for a certain filepath in C<%INC> is relative,
++C<Apache2::Reload> will use C<@INC> to try to resolve that relative
++path. Now remember that mod_perl freezes the value of C<@INC> at the
++server startup, and you can modify it only for the duration of one
++request when you need to load some module which is not in on of the
++C<@INC> directories. So a module gets loaded, and registered in
++C<%INC> with a relative path. Now when C<Apache2::Reload> tries to find
++that module to check whether it has been modified, it can't find since
++its directory is not in C<@INC>. So C<Apache2::Reload> will silently
++skip that module.
++
++You can enable the C<Debug|/Debug> mode to see what C<Apache2::Reload>
++does behind the scenes.
++
++
++
++=head2 Problems with Scripts Running with Registry Handlers that Cache the Code
++
++The following problem is relevant only to registry handlers that cache
++the compiled script. For example it concerns
++C<L<ModPerl::Registry|docs::2.0::api::ModPerl::Registry>> but not
++C<L<ModPerl::PerlRun|docs::2.0::api::ModPerl::PerlRun>>.
++
++=head3 The Problem
++
++Let's say that there is a module C<My::Utils>:
++
++  #file:My/Utils.pm
++  #----------------
++  package My::Utils;
++  BEGIN { warn __PACKAGE__ , " was reloaded\n" }
++  use base qw(Exporter);
++  @EXPORT = qw(colour);
++  sub colour { "white" }
++  1;
++
++And a registry script F<test.pl>:
++
++  #file:test.pl
++  #------------
++  use My::Utils;
++  print "Content-type: text/plain\n\n";
++  print "the color is " . colour();
++
++Assuming that the server is running in a single mode, we request the
++script for the first time and we get the response:
++
++  the color is white
++
++Now we change F<My/Utils.pm>:
++
++  -  sub colour { "white" }
++  +  sub colour { "red" }
++
++And issue the request again. C<Apache2::Reload> does its job and we can
++see that C<My::Utils> was reloaded (look in the I<error_log>
++file). However the script still returns:
++
++  the color is white
++
++=head3 The Explanation
++
++Even though F<My/Utils.pm> was reloaded, C<ModPerl::Registry>'s cached
++code won't run 'C<use My::Utils;>' again (since it happens only once,
++i.e. during the compile time). Therefore the script doesn't know that
++the subroutine reference has been changed.
++
++This is easy to verify. Let's change the script to be:
++
++  #file:test.pl
++  #------------
++  use My::Utils;
++  print "Content-type: text/plain\n\n";
++  my $sub_int = \&colour;
++  my $sub_ext = \&My::Utils::colour;
++  print "int $sub_int\n";
++  print "ext $sub_ext\n";
++
++Issue a request, you will see something similar to:
++
++  int CODE(0x8510af8)
++  ext CODE(0x8510af8)
++
++As you can see both point to the same CODE reference (meaning that
++it's the same symbol). After modifying F<My/Utils.pm> again:
++
++  -  sub colour { "red" }
++  +  sub colour { "blue" }
++
++and calling the script on the secondnd time, we get:
++
++  int CODE(0x8510af8)
++  ext CODE(0x851112c)
++
++You can see that the internal CODE reference is not the same as the
++external one.
++
++=head3 The Solution
++
++There are two solutions to this problem:
++
++Solution 1: replace C<use()> with an explicit C<require()> +
++C<import()>.
++
++ - use My::Utils;
++ + require My::Utils; My::Utils->import();
++
++now the changed functions will be reimported on every request.
++
++Solution 2: remember to touch the script itself every time you change
++the module that it requires.
++
++=head1 Threaded MPM and Multiple Perl Interpreters
++
++If you use C<Apache2::Reload> with a threaded MPM and multiple Perl
++interpreters, the modules will be reloaded by each interpreter as they
++are used, not every interpreters at once.  Similar to mod_perl 1.0
++where each child has its own Perl interpreter, the modules are
++reloaded as each child is hit with a request.
++
++If a module is loaded at startup, the syntax tree of each subroutine
++is shared between interpreters (big win), but each subroutine has its
++own padlist (where lexical my variables are stored).  Once
++C<Apache2::Reload> reloads a module, this sharing goes away and each
++Perl interpreter will have its own copy of the syntax tree for the
++reloaded subroutines.
++
++
++=head1 Pseudo-hashes
++
++The short summary of this is: Don't use pseudo-hashes. They are
++deprecated since Perl 5.8 and are removed in 5.9.
++
++Use an array with constant indexes. Its faster in the general case,
++its more guaranteed, and generally, it works.
++
++The long summary is that some work has been done to get this module
++working with modules that use pseudo-hashes, but it's still broken in
++the case of a single module that contains multiple packages that all
++use pseudo-hashes.
++
++So don't do that.
++
++
++
++
++=head1 Copyright
++
++mod_perl 2.0 and its core modules are copyrighted under
++The Apache Software License, Version 2.0.
++
++
++=head1 Authors
++
++Matt Sergeant, [email protected]
++
++Stas Bekman (porting to mod_perl 2.0)
++
++A few concepts borrowed from C<Stonehenge::Reload> by Randal Schwartz
++and C<Apache::StatINC> (mod_perl 1.x) by Doug MacEachern and Ask
++Bjoern Hansen.
++
++=cut
++
Binary file usr/src/cmd/apache2-modperl/mod_perl-2.0.2.tar.gz has changed
Binary file usr/src/cmd/apache2-modperl/mod_perl-2.0.4.tar.gz has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/apache2/modules/huge_mem_req_48024.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,16 @@
+diff -r fbb9516c1fff sed1.c
+--- sed1.c	Wed Sep 16 15:29:13 2009 -0700
++++ sed1.c	Fri Oct 16 17:04:58 2009 -0700
+@@ -99,6 +99,12 @@
+     int spendsize = 0;
+     if (*cursize >= newsize)
+         return;
++    /* Avoid number of times realloc is called. It could cause huge memory
++     * requirement if line size is huge e.g 2 MB */
++    if (newsize < *cursize * 2) {
++        newsize = *cursize * 2;
++    }
++
+     /* Align it to 4 KB boundary */
+     newsize = (newsize  + ((1 << 12) - 1)) & ~((1 << 12) -1);
+     newbuffer = apr_pcalloc(pool, newsize);
--- a/usr/src/cmd/apache2/modules/sed.mk	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/apache2/modules/sed.mk	Sun Dec 20 07:12:51 2009 +0200
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)sed.mk	1.2	09/03/06 SMI"
+#pragma ident	"@(#)sed.mk	1.3	09/10/29 SMI"
 #
 
 
@@ -51,6 +51,7 @@
 		/usr/bin/gzip -dc ../$(SED_VER).tar.gz | \
 			$(TAR) -xopf - && \
 		mv -f $(SED_VER) ../$(SED_VER)-$* )
+		cat huge_mem_req_48024.patch | (cd $(SED_VER)-$* && /bin/gpatch -p0)
 
 $(SED_VER)-%/mod_sed.so: $(SED_VER)-%/Makefile
 	env "ROOT=$(ROOT)" "MACH64=$(MACH64)" "CC=$(CC)" \
--- a/usr/src/cmd/cdrtools/Makefile.sfw	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/cdrtools/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.sfw	1.17	09/10/20 SMI"
+#ident	"@(#)Makefile.sfw	1.18	09/10/28 SMI"
 #
 VER=cdrtools-2.01.01a63
 
@@ -50,9 +50,6 @@
 	touch $(VER)/configure
 	find $(VER) -type d -exec chmod 755 "{}" \;
 	find $(VER) -type f -exec chmod ugo+r "{}" \;
-	chmod u+w $(VER)/cdrecord/cdrecord.c
-	patch -N $(VER)/cdrecord/cdrecord.c < cdrecord.c.patch
-	chmod u-w $(VER)/cdrecord/cdrecord.c
 
 clean:
 	-rm -rf $(VER)
--- a/usr/src/cmd/cdrtools/cdrecord.c.patch	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- cdrecord.c	Wed Oct 22 09:40:03 2008
-+++ cdrecord.c.dm	Wed Oct 22 09:36:37 2008
-@@ -492,18 +492,15 @@
- 	/*
- 	 * Give up privs we do not need anymore.
- 	 * We no longer need:
--	 *	file_dac_read,proc_lock_memory,proc_priocntl,net_privaddr
-+	 *	proc_lock_memory,proc_priocntl,net_privaddr
- 	 * We still need:
--	 *	sys_devices
-+	 *	file_dac_read, sys_devices
- 	 */
--	priv_set(PRIV_OFF, PRIV_EFFECTIVE,
--		PRIV_FILE_DAC_READ, PRIV_PROC_LOCK_MEMORY,
-+	priv_set(PRIV_OFF, PRIV_EFFECTIVE, PRIV_PROC_LOCK_MEMORY,
- 		PRIV_PROC_PRIOCNTL, PRIV_NET_PRIVADDR, NULL);
--	priv_set(PRIV_OFF, PRIV_PERMITTED,
--		PRIV_FILE_DAC_READ, PRIV_PROC_LOCK_MEMORY,
-+	priv_set(PRIV_OFF, PRIV_PERMITTED, PRIV_PROC_LOCK_MEMORY,
- 		PRIV_PROC_PRIOCNTL, PRIV_NET_PRIVADDR, NULL);
--	priv_set(PRIV_OFF, PRIV_INHERITABLE,
--		PRIV_FILE_DAC_READ, PRIV_PROC_LOCK_MEMORY,
-+	priv_set(PRIV_OFF, PRIV_INHERITABLE, PRIV_PROC_LOCK_MEMORY,
- 		PRIV_PROC_PRIOCNTL, PRIV_NET_PRIVADDR, PRIV_SYS_DEVICES, NULL);
- #endif
- 	/*
--- a/usr/src/cmd/emacs/METADATA	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/emacs/METADATA	Sun Dec 20 07:12:51 2009 +0200
@@ -1,13 +1,13 @@
 NAME:             emacs
-VERSION:          22.1
+VERSION:          23.1
 DESCRIPTION:      GNU Emacs editor
-LICENSE:          GPLv2
+LICENSE:          GPLv3
 PACKAGE:          SUNWgnu-emacs SUNWgnu-emacs-el SUNWgnu-emacs-gtk SUNWgnu-emacs-nox SUNWgnu-emacs-x
 PROJECT_URL:      http://www.gnu.org/software/emacs/
-SOURCE_DOWNLOAD:  http://ftp.gnu.org/pub/gnu/emacs/emacs-22.1.tar.gz
+SOURCE_DOWNLOAD:  http://ftp.gnu.org/pub/gnu/emacs/emacs-23.1.tar.gz
 SUPPORT:          Community
 BUGTRAQ:          solaris/utility/emacs
-OSR:              9575
+OSR:              13016
 COMMENTS:         
 	- This code is built with gcc. The primary reason for this
 	  is that the configure script has problems using a non-GNU
@@ -17,17 +17,13 @@
 
 	- I have made the following changes to the emacs sources:
 
-	    config.guess
-		Use amd64 as the machine for 64-bit amd64 builds
-		instead of i386-pc (which is still used for 32-bit).
+	    buffer_menu.patch
+		Fixes an issue with GTK and the Buffers menu where the
+		menu contents is not updated to show the current buffers
+		and instead shows a stale list. I based these patches
+		on the official ones applied to the emacs development branch:
 
-	    configure
-		Understand amd64 as a valid Solaris architecture
-
-	    src/gtkutil.c
-		Work around a bug in libglib-2.0 in the function
-		g_utf8_validate(). This bug manifests itself in
-		64-bit builds on amd64 platforms.
+		http://lists.gnu.org/archive/html/emacs-diffs/2009-09/msg00039.html
 
 	    src/s/sol2-5.h
 		Use the system malloc instead of the built in one
@@ -77,8 +73,10 @@
 
 	  SUNWgnu-emacs is required by the other packages.
 
-	  Note that SUNWgnu-emacs-gtk does not deliver sparcv9 binaries at
-	  this time. There are unresolved GTK issues.
+	  Note that earlier versions (22.1) of SUNWgnu-emacs-gtk did not
+	  deliver sparcv9 binaries, as there were unresolved GTK issues.
+	  This appears to be solved in emacs 23, and we now deliver the
+	  sparcv9 binaries.
 
 	- The emacs Makefile install rule does more than copy files around.
 	  It runs emacs in batch mode to generate compiled lisp files,
@@ -97,9 +95,12 @@
 		  location, causing the binaries and lisp code to contain
 		  the proper final paths.
 
-		- install-sfw runs the emacs makefile install rule to populate
-		  the proto by overriding the variables it uses to place
-		  the files.
+		- Makefile.sfw runs the emacs makefile install rule to populate
+		  a local proto directory by overriding the Make variables
+		  used to place the files.
+
+		- install-sfw copies the files from the local proto directory
+		  into the workspace proto.
 
 		- Packing then proceeds as usual
 
@@ -119,11 +120,3 @@
 	  this is that we do not install update-game-score as setuid, and
 	  therefore the game files are not usable. This the same decision made
 	  by Debian, among others.
-
-	- At this time, the libXaw delivered with Solaris Nevada is
-	  incompatible with the Xorg version. Until this is worked out,
-	  OpenSolaris does not have libXaw, and emacs-x will not run.
-
-
-
-
--- a/usr/src/cmd/emacs/Makefile.sfw	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/emacs/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -19,12 +19,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)Makefile.sfw	1.2	08/09/26 SMI"
+# ident	"@(#)Makefile.sfw	1.3	09/10/29 SMI"
 
-VER=22.1
+VER=23.1
 EMACSDIST=emacs-$(VER)
 
 include ../Makefile.cmd
@@ -77,12 +77,9 @@
 		$(PBIN32)/emacs-nox	$(PBIN32)/emacs-nox-$(VER) \
 		$(PBIN64)/emacs-nox	$(PBIN64)/emacs-nox-$(VER)
 
-# Note: 64-bit emacs-gtk is not shipped on sparc at this time
-EMACS_GTK_i386=	$(PBIN64)/emacs-gtk	$(PBIN64)/emacs-gtk-$(VER)
-EMACS_GTK_sparc=
 EMACS_GTK=	$(PBIN)/emacs-gtk	$(PBIN)/emacs-gtk-$(VER) \
 		$(PBIN32)/emacs-gtk	$(PBIN32)/emacs-gtk-$(VER) \
-		$(EMACS_GTK_$(MACH))
+		$(PBIN64)/emacs-gtk	$(PBIN64)/emacs-gtk-$(VER)
 
 # On X86, the machine types differ (i386-pc and x86_64-pc). We want
 # to share the 32-bit architecture specific binaries in both cases,
@@ -98,9 +95,6 @@
 	then echo  '$(LIBDIR)/x86_64-pc-solaris$(SOL_REV)'; \
 	fi
 
-# For now, we don't do the GTK builds. The 32-bit version generates
-# assert failures, and the 64-bit version dumps core.
-#
 all: $(EMACS_X) .WAIT $(EMACS_NOX) .WAIT $(EMACS_GTK) .WAIT \
 	$(PBIN)/emacs .WAIT $(MANPAGES) $(LIBDIRSYMLINK)
 
@@ -191,10 +185,10 @@
 # ctags is a special case that should not go through sunman.pl.
 # It simply inlines etags.1.
 #
-$(PGSHAREMAN1)/ctags.1: $(EMACSDIST)/etc/ctags.1
-	cp $(EMACSDIST)/etc/ctags.1 $(PGSHAREMAN1)/ctags.1
+$(PGSHAREMAN1)/ctags.1: $(EMACSDIST)/doc/man/ctags.1
+	cp $(EMACSDIST)/doc/man/ctags.1 $(PGSHAREMAN1)/ctags.1
 
-$(PSHAREMAN1)/% $(PGSHAREMAN1)/%: $(EMACSDIST)/etc/%
+$(PSHAREMAN1)/% $(PGSHAREMAN1)/%: $(EMACSDIST)/doc/man/%
 	perl tools/sunman.pl SUNWgnu-emacs < $< > $@
 
 # Manpages lacking from the emacs distribution that we supply
--- a/usr/src/cmd/emacs/augment/man/man1/b2m.1	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-.\" Copyright (C) 2008  Free Software Foundation, Inc.
-.\" See section COPYING for conditions for redistribution
-.TH b2m 1 "21jul2008" "GNU Tools" "GNU Tools"
-.de BP
-.sp
-.ti -.2i
-\(**
-..
-
-.SH NAME
-b2m \- convert GNU emacs Babyl format mail files to Unix mbox format
-.SH SYNOPSIS
-.hy 0
-.na
-\fBb2m\fP [\|\-hV\|] [\|\-\-help\|] [\|\-\-version\|]
-.ad b
-.hy 1
-.SH DESCRIPTION
-The \|\fBb2m\fP\| program converts the Babyl formatted mail file on stdin
-to standard Unix mbox format, and writes the result to stdout.
-\|\fBb2m\fP\| is included as part of the GNU emacs package.
-.SH OPTIONS
-The program accepts unambiguous abbreviations for long option names.
-.TP
-.B \-h, \-\-help
-Print usage information.
-.TP
-.B \-V, \-\-version
-Print the current version of the program (same as the version of the
-emacs \fBb2m\fP is shipped with).
-
-.SH "SEE ALSO"
-.BR emacs ( 1 ),
-.BR info ( 1 )
-.P
-`\|\fBemacs\fP\|' entry in \fBinfo\fP; \fIGNU Emacs Manual\fP, Richard
-Stallman.
-
-.SH COPYING
-Copyright
-.if t \(co
-.if n (c)
-2008  Free Software Foundation, Inc.
-.PP
-Permission is granted to make and distribute verbatim copies of this
-document provided the copyright notice and this permission notice are
-preserved on all copies.
-.PP
-Permission is granted to copy and distribute modified versions of
-this document under the conditions for verbatim copying, provided that
-the entire resulting derived work is distributed under the terms of
-a permission notice identical to this one.
-.PP
-Permission is granted to copy and distribute translations of this
-document into another language, under the above conditions for
-modified versions, except that this permission notice may be stated
-in a translation approved by the Free Software Foundation.
-
-.\" arch-tag: 9534977f-af78-42f0-991d-1df6b6c05573
--- a/usr/src/cmd/emacs/augment/man/man1/ebrowse.1	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-.\" Copyright (C) 2008  Free Software Foundation, Inc.
-.\" See section COPYING for conditions for redistribution
-.TH ebrowse 1 "21jul2008" "GNU Tools" "GNU Tools"
-.de BP
-.sp
-.ti -.2i
-\(**
-..
-
-.SH NAME
-ebrowse \- C++ class browser for emacs
-.SH SYNOPSIS
-.hy 0
-.na
-\fBebrowse\fP [\|\-anpsvVx\|]
-[\|\-f=\fIFILES\fP\|] [\|\-I=\fILIST\fP\|] [\|\-m=\fIN\fP\|] [\|\-M=\fIN\fP\|]
-[\|\-o=\fIFILE\fP\|]
-.br
-[\|\-\-append\|] [\|\-\-files=\fIFILES\fP\|]  [\|\-\-help\|]
-[\|\-\-max-regexp-length=\fIN\fP\|] [\|\-\-min-regexp-length=\fIN\fP\|]
-[\|\-\-no-nested-classes\|] [\|\-\-no-regexps\|] [\|\-\-no-structs-or-unions\|] 
-[\|\-\-output-file=\fIFILE\fP\|]
-.br
-[\|\-\-position-info\|] [\|\-\-search-path=\fILIST\fP\|]
-[\|\-\-verbose\|] [\|\-\-version\|] [\|\-\-very-verbose\|]
-[\fIfile\fP].\|.\|.
-.ad b
-.hy 1
-.SH DESCRIPTION
-\|\fBebrowse\fP\| is a parser used to process C++ source files. It generates
-a data base containing information about classes, members, global functions,
-defines, types etc. found in the sources. To browse the class, the resulting
-BROWSE file is then opened within emacs.
-.P
-\|\fBebrowse\fP\| is included as part of the GNU emacs package.
-Full  documentation is available in the GNU Info format.
-.SH OPTIONS
-The program accepts unambiguous abbreviations for long option names.
-.TP
-.B \-a, \-\-append
-Append output to existing file.
-.TP
-.B  \-f, \-\-files=FILES
-Read input file names from FILE.
-.TP
-.B \-\-help
-Print usage information.
-.TP
-.B \-I, \-\-search\-path=LIST
-Set search path for input files.
-.TP
-.B  \-m, \-\-min\-regexp\-length=N
-Set minimum regexp length to N.
-.TP
-.B  \-M, \-\-max\-regexp\-length=N
-Set maximum regexp length to N.
-.TP
-.B  \-n, \-\-no\-nested\-classes
-Exclude nested classes.
-.TP
-.B \-o, \-\-output\-file=FILE
-Set output file name to FILE.
-.TP
-.B \-p, \-\-position\-info
-Print info about position in file.
-.TP
-.B \-s, \-\-no\-structs\-or\-unions
-Don't record structs or unions.
-.TP
-.B  \-v, \-\-verbose
-Be verbose.
-.TP
-.B \-V, \-\-very\-verbose
-Be very verbose.
-.TP
-.B \-x, \-\-no\-regexps
-Don't record regular expressions.
-.TP
-.B \-\-version
-Print the current version of the program.
-
-.SH "SEE ALSO"
-.BR emacs ( 1 ),
-.BR info ( 1 )
-.P
-`\|\fBebrowse\fP\|' entry in \fBinfo\fP
-.P
-`\|\fBemacs\fP\|' entry in \fBinfo\fP; \fIGNU Emacs Manual\fP, Richard
-Stallman.
-
-.SH COPYING
-Copyright
-.if t \(co
-.if n (c)
-2008  Free Software Foundation, Inc.
-.PP
-Permission is granted to make and distribute verbatim copies of this
-document provided the copyright notice and this permission notice are
-preserved on all copies.
-.PP
-Permission is granted to copy and distribute modified versions of
-this document under the conditions for verbatim copying, provided that
-the entire resulting derived work is distributed under the terms of
-a permission notice identical to this one.
-.PP
-Permission is granted to copy and distribute translations of this
-document into another language, under the above conditions for
-modified versions, except that this permission notice may be stated
-in a translation approved by the Free Software Foundation.
-
-.\" arch-tag: 9534977f-af78-42f0-991d-1df6b6c05573
--- a/usr/src/cmd/emacs/augment/man/man1/grep-changelog.1	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-.\" Copyright (C) 2008  Free Software Foundation, Inc.
-.\" See section COPYING for conditions for redistribution
-.TH grep-changelog 1 "21jul2008" "GNU Tools" "GNU Tools"
-.de BP
-.sp
-.ti -.2i
-\(**
-..
-
-.SH NAME
-grep-changelog \- print change log entries matching criteria
-.SH SYNOPSIS
-.hy 0
-.na
-\fBgrep-changelog\fP
-[\|\-\-author=\fIAUTHOR\fP\|] [\|\-\-text=\fITEXT\fP\|]
-.br
-[\|\-\-exclude=\fITEXT\fP\|] [\|\-\-from-date=\fIYYYY-MM-DD\fP\|]
-[\|\-\-help\|]
-.br
-[\|\-\-to-date=\fIYYYY-MM-DD\fP\|] [\|\-\-rcs-log\|] [\|\-\-with-date\|]
-[\|\-\-reverse\|] [\|\-\-version\|]
-[\fIChangeLog\fP].\|.\|.
-.ad b
-.hy 1
-.SH DESCRIPTION
-\|\fBgrep-changelog\fP\| prints entries in change log files that
-match the specified criteria.
-\|\fBgrep-changelog\fP\| is included as part of the GNU emacs package.
-.SH OPTIONS
-The program accepts unambiguous abbreviations for long option names.
-.TP
-.B \--author=AUTHOR
-Match entries whose author line matches regular expression AUTHOR.
-.TP
-.B \--text=TEXT
-Match entries whose text matches regular expression TEXT.
-.TP
-.B \--exclude=TEXT
-Exclude entries matching TEXT.
-.TP
-.B \--from-date=YYYY-MM-DD
- Match entries not older than given date.
-.TP
-.B \-h, \-\-help
-Print usage information.
-.TP
-.B \--to-date=YYYY-MM-DD
- Match entries not younger than given date.
-.TP
-.B \--rcs-log
-Format output suitable for RCS log entries.
-.TP
-.B \--with-date
-Print short date line in RCS log.
-.TP
-.B \--reverse
-Show entries in reverse (chronological) order.
-.TP
-.B \-v, \-\-version
-Print the current version of the program.
-
-.SH "SEE ALSO"
-.BR emacs ( 1 ),
-.BR info ( 1 )
-.P
-`\|\fBemacs\fP\|' entry in \fBinfo\fP; \fIGNU Emacs Manual\fP, Richard
-Stallman.
-
-.SH COPYING
-Copyright
-.if t \(co
-.if n (c)
-2008  Free Software Foundation, Inc.
-.PP
-Permission is granted to make and distribute verbatim copies of this
-document provided the copyright notice and this permission notice are
-preserved on all copies.
-.PP
-Permission is granted to copy and distribute modified versions of
-this document under the conditions for verbatim copying, provided that
-the entire resulting derived work is distributed under the terms of
-a permission notice identical to this one.
-.PP
-Permission is granted to copy and distribute translations of this
-document into another language, under the above conditions for
-modified versions, except that this permission notice may be stated
-in a translation approved by the Free Software Foundation.
-
-.\" arch-tag: 9534977f-af78-42f0-991d-1df6b6c05573
--- a/usr/src/cmd/emacs/augment/man/man1/rcs-checkin.1	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-.\" Copyright (C) 2008  Free Software Foundation, Inc.
-.\" See section COPYING for conditions for redistribution
-.TH rcs-checkin 1 "21jul2008" "GNU Tools" "GNU Tools"
-.de BP
-.sp
-.ti -.2i
-\(**
-..
-
-.SH NAME
-rcs-checkin \- check files into RCS
-.SH SYNOPSIS
-.hy 0
-.na
-\fBrcs-checkin\fP \fIfile\fP.\|.\|.
-.ad b
-.hy 1
-.SH DESCRIPTION
-The \|\fBrcs-checkin\fP\| script checks files into RCS,
-preserving Emacs version files as deltas within the resulting RCS file.
-\|\fBrcs-checkin\fP\| is included as part of the GNU emacs package.
-.P
-Arguments which are detectably either RCS masters (with names ending in ,v)
-or Emacs version files  (with names of the form foo.~<number>~) are ignored.
-For each file foo, the script looks for Emacs version files related to it.
-These files are checked in as deltas, oldest first, so that the contents of
-the file itself becomes the latest revision in the master.
-.P
-The first line of each file is used as its description text.  The file itself
-is not deleted, as under VC with vc-keep-workfiles at its default of t, but
-all the version files are.
-.P
-If an argument file is already version-controlled under RCS, any version
-files are added to the list of deltas and deleted, and then the workfile
-is checked in again as the latest version.  This is probably not quite
-what was wanted, and is the main reason VC doesn't simply call this to
-do checkins.
-.P
-This script is intended to be used to convert files with an old-Emacs-style
-version history for use with VC (the Emacs 19 version-control interface),
-which likes to use RCS as its back end.
-
-.SH "SEE ALSO"
-.BR emacs ( 1 ),
-.BR info ( 1 )
-.P
-`\|\fBemacs\fP\|' entry in \fBinfo\fP; \fIGNU Emacs Manual\fP, Richard
-Stallman.
-
-.SH COPYING
-Copyright
-.if t \(co
-.if n (c)
-2008  Free Software Foundation, Inc.
-.PP
-Permission is granted to make and distribute verbatim copies of this
-document provided the copyright notice and this permission notice are
-preserved on all copies.
-.PP
-Permission is granted to copy and distribute modified versions of
-this document under the conditions for verbatim copying, provided that
-the entire resulting derived work is distributed under the terms of
-a permission notice identical to this one.
-.PP
-Permission is granted to copy and distribute translations of this
-document into another language, under the above conditions for
-modified versions, except that this permission notice may be stated
-in a translation approved by the Free Software Foundation.
-
-.\" arch-tag: 9534977f-af78-42f0-991d-1df6b6c05573
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/emacs/augment/patch/buffer_menu.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,216 @@
+*** emacs-23.1/src/ChangeLog.orig	Wed Oct 14 16:57:29 2009
+--- emacs-23.1/src/ChangeLog	Wed Oct 14 17:35:12 2009
+***************
+*** 1,3 ****
+--- 1,19 ----
++ 2009-09-02  Jan Djärv  <[email protected]>
++ 
++ 	* xterm.h: Rename x_non_menubar_window_to_frame to
++ 	x_menubar_window_to_frame
++ 
++ 	* xterm.c: Remove declarations also in xterm.h
++ 	(XTmouse_position): Do not return valid positions
++ 	for clicks in the menubar and the toolbar for Gtk+.
++ 
++ 	* xfns.c (x_any_window_to_frame): Assume less about Gtk+ internals,
++ 	if the widget for the event has the same top level as a frame,
++ 	return the frame.
++ 	(x_menubar_window_to_frame): Detect menu bar even with Gtk+
++ 	internal windows, bug #4122.
++ 	(x_non_menubar_window_to_frame): Remove.
++ 	
+  2009-07-29  Chong Yidong  <[email protected]>
+  
+  	* Version 23.1 released.
+*** emacs-23.1/src/xfns.c.orig	Wed Oct 14 16:50:22 2009
+--- emacs-23.1/src/xfns.c	Wed Oct 14 17:35:12 2009
+***************
+*** 374,383 ****
+  #ifdef USE_GTK
+                GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
+                if (gwdesc != 0
+!                   && (gwdesc == x->widget
+!                       || gwdesc == x->edit_widget
+!                       || gwdesc == x->vbox_widget
+!                       || gwdesc == x->menubar_widget))
+                  found = f;
+  #else
+  	      if (wdesc == XtWindow (x->widget)
+--- 374,380 ----
+  #ifdef USE_GTK
+                GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
+                if (gwdesc != 0
+!                   && gtk_widget_get_toplevel(gwdesc) == x->widget)
+                  found = f;
+  #else
+  	      if (wdesc == XtWindow (x->widget)
+***************
+*** 398,451 ****
+    return found;
+  }
+  
+- /* Likewise, but exclude the menu bar widget.  */
+- 
+- struct frame *
+- x_non_menubar_window_to_frame (dpyinfo, wdesc)
+-      struct x_display_info *dpyinfo;
+-      int wdesc;
+- {
+-   Lisp_Object tail, frame;
+-   struct frame *f;
+-   struct x_output *x;
+- 
+-   if (wdesc == None) return 0;
+- 
+-   for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
+-     {
+-       frame = XCAR (tail);
+-       if (!FRAMEP (frame))
+-         continue;
+-       f = XFRAME (frame);
+-       if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
+- 	continue;
+-       x = f->output_data.x;
+-       /* This frame matches if the window is any of its widgets.  */
+-       if (x->hourglass_window == wdesc)
+- 	return f;
+-       else if (x->widget)
+- 	{
+- #ifdef USE_GTK
+-           GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
+-           if (gwdesc != 0
+-               && (gwdesc == x->widget
+-                   || gwdesc == x->edit_widget
+-                   || gwdesc == x->vbox_widget))
+-             return f;
+- #else
+- 	  if (wdesc == XtWindow (x->widget)
+- 	      || wdesc == XtWindow (x->column_widget)
+- 	      || wdesc == XtWindow (x->edit_widget))
+- 	    return f;
+- #endif
+- 	}
+-       else if (FRAME_X_WINDOW (f) == wdesc)
+- 	/* A tooltip frame.  */
+- 	return f;
+-     }
+-   return 0;
+- }
+- 
+  /* Likewise, but consider only the menu bar widget.  */
+  
+  struct frame *
+--- 395,400 ----
+***************
+*** 473,487 ****
+        if (x->menubar_widget)
+          {
+            GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
+-           int found = 0;
+  
+!           BLOCK_INPUT;
+            if (gwdesc != 0
+                && (gwdesc == x->menubar_widget
+!                   || gtk_widget_get_parent (gwdesc) == x->menubar_widget))
+!             found = 1;
+!           UNBLOCK_INPUT;
+!           if (found) return f;
+          }
+  #else
+        if (x->menubar_widget
+--- 422,435 ----
+        if (x->menubar_widget)
+          {
+            GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
+  
+! 	  /* This gives false positives, but the rectangle check in xterm.c
+! 	     where this is called takes care of that. */
+            if (gwdesc != 0
+                && (gwdesc == x->menubar_widget
+! 		  || gtk_widget_is_ancestor (x->menubar_widget, gwdesc)
+! 		  || gtk_widget_is_ancestor (gwdesc, x->menubar_widget)))
+! 	    return f;
+          }
+  #else
+        if (x->menubar_widget
+*** emacs-23.1/src/xterm.c.orig	Wed Oct 14 16:37:20 2009
+--- emacs-23.1/src/xterm.c	Wed Oct 14 17:35:12 2009
+***************
+*** 109,116 ****
+  #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+  
+  extern void free_frame_menubar P_ ((struct frame *));
+- extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *,
+- 						    int));
+  #endif
+  
+  #ifdef USE_X_TOOLKIT
+--- 109,114 ----
+***************
+*** 143,153 ****
+  
+  #endif /* USE_X_TOOLKIT */
+  
+- #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
+- #define x_any_window_to_frame x_window_to_frame
+- #define x_top_window_to_frame x_window_to_frame
+- #endif
+- 
+  #ifdef USE_X_TOOLKIT
+  #include "widget.h"
+  #ifndef XtNinitialState
+--- 141,146 ----
+***************
+*** 3916,3921 ****
+--- 3909,3923 ----
+  		if (child == None || child == win)
+  		  break;
+  
++ #ifdef USE_GTK
++ 		/* We don't wan't to know the innermost window.  We
++ 		   want the edit window.  For non-Gtk+ the innermost
++ 		   window is the edit window.  For Gtk+ it might not
++ 		   be.  It might be the tool bar for example.  */
++ 		if (x_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win))
++ 		  break;
++ #endif
++ 
+  		win = child;
+  		parent_x = win_x;
+  		parent_y = win_y;
+***************
+*** 3932,3939 ****
+--- 3934,3947 ----
+  	       parent_{x,y} are invalid, but that's okay, because we'll
+  	       never use them in that case.)  */
+  
++ #ifdef USE_GTK
++ 	     /* We don't wan't to know the innermost window. We
++ 		want the edit window. */
++ 	    f1 = x_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win);
++ #else
+  	    /* Is win one of our frames?  */
+  	    f1 = x_any_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win);
++ #endif
+  
+  #ifdef USE_X_TOOLKIT
+  	    /* If we end up with the menu bar window, say it's not
+*** emacs-23.1/src/xterm.h.orig	Wed Oct 14 15:08:03 2009
+--- emacs-23.1/src/xterm.h	Wed Oct 14 17:35:12 2009
+***************
+*** 374,380 ****
+  
+  #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+  extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int));
+! extern struct frame *x_non_menubar_window_to_frame P_ ((struct x_display_info *, int));
+  extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int));
+  #endif
+  
+--- 374,380 ----
+  
+  #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+  extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int));
+! extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int));
+  extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int));
+  #endif
+  
--- a/usr/src/cmd/emacs/augment/patch/config.guess.patch	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-*** emacs-22.1.orig/config.guess	Sat Jun  2 05:19:54 2007
---- emacs-22.1/config.guess	Mon Jul 14 12:50:13 2008
-***************
-*** 331,337 ****
-  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-  	exit ;;
-      i86pc:SunOS:5.*:*)
-! 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-  	exit ;;
-      sun4*:SunOS:6*:*)
-  	# According to config.sub, this is the proper way to canonicalize
---- 331,345 ----
-  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-  	exit ;;
-      i86pc:SunOS:5.*:*)
-! 	eval $set_cc_for_build
-! 	if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-! 	    grep __LP64__ >/dev/null
-! 	then
-! 	    SUN_ARCH="i386-pc"
-! 	else
-! 	    SUN_ARCH="amd64"
-! 	fi
-! 	echo ${SUN_ARCH}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-  	exit ;;
-      sun4*:SunOS:6*:*)
-  	# According to config.sub, this is the proper way to canonicalize
--- a/usr/src/cmd/emacs/augment/patch/configure.patch	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-*** emacs-22.1.orig/configure	Fri May 25 06:43:29 2007
---- emacs-22.1/configure	Mon Jul 14 10:33:01 2008
-***************
-*** 2939,2945 ****
-    ;;
-  
-    *-auspex-sunos* | *-sun-sunos* | *-sun-bsd* | *-sun-solaris* \
-!     | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* | powerpc*-*-solaris2* \
-      | rs6000-*-solaris2*)
-      case "${canonical}" in
-        m68*-sunos1* )	machine=sun1 ;;
---- 2939,2945 ----
-    ;;
-  
-    *-auspex-sunos* | *-sun-sunos* | *-sun-bsd* | *-sun-solaris* \
-!     | i[3456]86-*-solaris2* | x86_64-*-solaris2* | i[3456]86-*-sunos5* | powerpc*-*-solaris2* \
-      | rs6000-*-solaris2*)
-      case "${canonical}" in
-        m68*-sunos1* )	machine=sun1 ;;
--- a/usr/src/cmd/emacs/augment/patch/dldump.patch	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/emacs/augment/patch/dldump.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -1,5 +1,5 @@
-*** emacs-22.1.orig/src/s/sol2-6.h	Fri Mar 19 18:10:19 2004
---- emacs-22.1/src/s/sol2-6.h	Sun Jul 20 13:31:28 2008
+*** emacs-23.1/src/s/sol2-6.h.orig	Wed Oct 14 17:55:32 2009
+--- emacs-23.1/src/s/sol2-6.h	Wed Oct 14 17:56:46 2009
 ***************
 *** 2,11 ****
   
@@ -22,7 +22,7 @@
 !  *
 !  * If you encounter a problem using dldump(), please consider sending
 !  * a message to the OpenSolaris tools-linking mailing list:
-!  *	http://mail.opensolaris.org/mailman/listinfo/tools-linking
+!  *      http://mail.opensolaris.org/mailman/listinfo/tools-linking
 !  */
 ! 
   #undef UNEXEC
--- a/usr/src/cmd/emacs/augment/patch/gtkutil.patch	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-*** emacs-22.1.orig/src/gtkutil.c	Mon May 14 08:56:31 2007
---- emacs-22.1/src/gtkutil.c	Sun Aug 17 17:37:02 2008
-***************
-*** 510,516 ****
-    if (!str) return NULL;
-  
-    /* If not UTF-8, try current locale.  */
-!   if (!g_utf8_validate (str, -1, NULL))
-      utf8_str = g_locale_to_utf8 (str, -1, 0, 0, 0);
-  
-    if (!utf8_str) 
---- 510,516 ----
-    if (!str) return NULL;
-  
-    /* If not UTF-8, try current locale.  */
-!   if (!g_utf8_validate (str, strlen(str), NULL))
-      utf8_str = g_locale_to_utf8 (str, -1, 0, 0, 0);
-  
-    if (!utf8_str) 
--- a/usr/src/cmd/emacs/augment/patch/sysmalloc.patch	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/emacs/augment/patch/sysmalloc.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -1,8 +1,8 @@
-*** emacs-22.1.orig/src/s/sol2-5.h	Mon Sep  1 09:45:58 2003
---- emacs-22.1/src/s/sol2-5.h	Mon Jul 14 11:45:39 2008
+*** emacs-23.1/src/s/sol2-5.h.orig	Wed Oct 14 17:57:22 2009
+--- emacs-23.1/src/s/sol2-5.h	Wed Oct 14 17:58:54 2009
 ***************
-*** 21,26 ****
---- 21,27 ----
+*** 17,22 ****
+--- 17,23 ----
   /* This is not always necessary.  Turned off at present for testers to
      identify any problems with gmalloc more accurately.  */
   /* #define SYSTEM_MALLOC */
Binary file usr/src/cmd/emacs/emacs-22.1.tar.gz has changed
Binary file usr/src/cmd/emacs/emacs-23.1.tar.gz has changed
--- a/usr/src/cmd/emacs/install-sfw	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/emacs/install-sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -22,46 +22,68 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)install-sfw	1.2	09/07/24 SMI"
-
-
+# ident	"@(#)install-sfw	1.3	09/10/29 SMI"
 
 case "$MACH" in
-i386)	MACH32=i86; MACH64=amd64;;
-sparc)	MACH32=sparcv7; MACH64=sparcv9;;
+i386)	;;
+sparc)	;;
 *)	echo "install-sfw: unknown value for MACH: '$MACH'" >&2; exit 1;;
 esac
 
-
-# install-sfw: Install GNU emacs into the workspace proto area.
-
+# Get SFW provided _install function used to copy the files into place.
 . ${SRC}/tools/install.subr
 
-SOL_REV=`uname -r | sed "s,^5\.,2\.,"`
+# Solaris version, in the form produced by the configure script.
+# If the Solaris version changes, the name generated by configure will
+# also change. Use of this environment variable allows us to match it
+# without having to hardwire anything.
+SOL_REV=`uname -r | sed "s,^5.,2.,"`
 
 cd proto
 
 
-SFL="usr"
-DST="${ROOT}/usr"
-
-
 SFL="usr/bin"
 DST="${ROOT}/usr/bin"
 _install E ${SFL}/b2m	${DST}/b2m	555
 _install E ${SFL}/ebrowse	${DST}/ebrowse	555
 _install S ${SFL}/emacs	${DST}/emacs	555
 _install E ${SFL}/emacsclient	${DST}/emacsclient	555
+(cd ${DST}; _install H ../lib/isaexec emacs-gtk)
+(cd ${DST}; _install H ../lib/isaexec emacs-gtk-23.1)
+(cd ${DST}; _install H ../lib/isaexec emacs-nox)
+(cd ${DST}; _install H ../lib/isaexec emacs-nox-23.1)
+(cd ${DST}; _install H ../lib/isaexec emacs-x)
+(cd ${DST}; _install H ../lib/isaexec emacs-x-23.1)
 _install P ${SFL}/grep-changelog	${DST}/grep-changelog	555
 _install S ${SFL}/rcs-checkin	${DST}/rcs-checkin	555
-(cd ${DST}; _install H ../lib/isaexec emacs-gtk-22.1)
-(cd ${DST}; _install H ../lib/isaexec emacs-gtk)
-(cd ${DST}; _install H ../lib/isaexec emacs-nox-22.1)
-(cd ${DST}; _install H ../lib/isaexec emacs-nox)
-(cd ${DST}; _install H ../lib/isaexec emacs-x-22.1)
-(cd ${DST}; _install H ../lib/isaexec emacs-x)
-SFL="usr/gnu"
-DST="${ROOT}/usr/gnu"
+if [ "$MACH" = "i386" ]; then
+    SFL="usr/bin/i86"
+    DST="${ROOT}/usr/bin/i86"
+fi
+if [ "$MACH" = "sparc" ]; then
+    SFL="usr/bin/sparcv7"
+    DST="${ROOT}/usr/bin/sparcv7"
+fi
+_install E ${SFL}/emacs-gtk-23.1	${DST}/emacs-gtk-23.1	555
+(cd ${DST}; _install H emacs-gtk-23.1 emacs-gtk)
+_install E ${SFL}/emacs-nox-23.1	${DST}/emacs-nox-23.1	555
+(cd ${DST}; _install H emacs-nox-23.1 emacs-nox)
+_install E ${SFL}/emacs-x-23.1	${DST}/emacs-x-23.1	555
+(cd ${DST}; _install H emacs-x-23.1 emacs-x)
+if [ "$MACH" = "i386" ]; then
+    SFL="usr/bin/amd64"
+    DST="${ROOT}/usr/bin/amd64"
+fi
+if [ "$MACH" = "sparc" ]; then
+    SFL="usr/bin/sparcv9"
+    DST="${ROOT}/usr/bin/sparcv9"
+fi
+_install E ${SFL}/emacs-gtk-23.1	${DST}/emacs-gtk-23.1	555
+(cd ${DST}; _install H emacs-gtk-23.1 emacs-gtk)
+_install E ${SFL}/emacs-nox-23.1	${DST}/emacs-nox-23.1	555
+(cd ${DST}; _install H emacs-nox-23.1 emacs-nox)
+_install E ${SFL}/emacs-x-23.1	${DST}/emacs-x-23.1	555
+(cd ${DST}; _install H emacs-x-23.1 emacs-x)
 
 
 SFL="usr/gnu/bin"
@@ -70,48 +92,22 @@
 _install E ${SFL}/etags	${DST}/etags	555
 
 
-SFL="usr/bin/${MACH32}"
-DST="${ROOT}/usr/bin/${MACH32}"
-_install E ${SFL}/emacs-gtk-22.1	${DST}/emacs-gtk-22.1	555
-(cd ${DST}; _install H emacs-gtk-22.1 emacs-gtk)
-_install E ${SFL}/emacs-nox-22.1	${DST}/emacs-nox-22.1	555
-(cd ${DST}; _install H emacs-nox-22.1 emacs-nox)
-_install E ${SFL}/emacs-x-22.1	${DST}/emacs-x-22.1	555
-(cd ${DST}; _install H emacs-x-22.1 emacs-x)
+SFL="usr/gnu/share/man/man1"
+DST="${ROOT}/usr/gnu/share/man/man1"
+_install N ${SFL}/ctags.1	${DST}/ctags.1	444
+_install N ${SFL}/etags.1	${DST}/etags.1	444
 
 
-SFL="usr/bin/${MACH64}"
-DST="${ROOT}/usr/bin/${MACH64}"
-if [ "$MACH" != "sparc" ]; then
-	_install E ${SFL}/emacs-gtk-22.1	${DST}/emacs-gtk-22.1	555
-	(cd ${DST}; _install H emacs-gtk-22.1 emacs-gtk)
+SFL="usr/lib/emacs/23.1"
+DST="${ROOT}/usr/lib/emacs/23.1"
+if [ "$MACH" = "i386" ]; then
+    SFL="usr/lib/emacs/23.1/i386-pc-solaris${SOL_REV}"
+    DST="${ROOT}/usr/lib/emacs/23.1/i386-pc-solaris${SOL_REV}"
+    (cd ${DST}/..; _install L i386-pc-solaris${SOL_REV} x86_64-pc-solaris${SOL_REV})
 fi
-_install E ${SFL}/emacs-nox-22.1	${DST}/emacs-nox-22.1	555
-(cd ${DST}; _install H emacs-nox-22.1 emacs-nox)
-_install E ${SFL}/emacs-x-22.1	${DST}/emacs-x-22.1	555
-(cd ${DST}; _install H emacs-x-22.1 emacs-x)
-
-
-SFL="usr/lib"
-DST="${ROOT}/usr/lib"
-
-
-SFL="usr/lib/emacs"
-DST="${ROOT}/usr/lib/emacs"
-
-
-SFL="usr/lib/emacs/22.1"
-DST="${ROOT}/usr/lib/emacs/22.1"
-
-
-if [ "$MACH" = "i386" ]; then
-	SFL="usr/lib/emacs/22.1/i386-pc-solaris${SOL_REV}"
-	DST="${ROOT}/usr/lib/emacs/22.1/i386-pc-solaris${SOL_REV}"
-	(cd ${DST}/..; _install L i386-pc-solaris${SOL_REV} \
-		x86_64-pc-solaris${SOL_REV})
-else
-	SFL="usr/lib/emacs/22.1/sparc-sun-solaris${SOL_REV}"
-	DST="${ROOT}/usr/lib/emacs/22.1/sparc-sun-solaris${SOL_REV}"
+if [ "$MACH" = "sparc" ]; then
+    SFL="usr/lib/emacs/23.1/sparc-sun-solaris${SOL_REV}"
+    DST="${ROOT}/usr/lib/emacs/23.1/sparc-sun-solaris${SOL_REV}"
 fi
 _install E ${SFL}/cvtmail	${DST}/cvtmail	555
 _install E ${SFL}/digest-doc	${DST}/digest-doc	555
@@ -125,28 +121,23 @@
 _install S ${SFL}/vcdiff	${DST}/vcdiff	555
 
 
-SFL="usr/share"
-DST="${ROOT}/usr/share"
-
-
-SFL="usr/share/emacs"
-DST="${ROOT}/usr/share/emacs"
+SFL="usr/share/applications"
+DST="${ROOT}/usr/share/applications"
+_install N ${SFL}/emacs.desktop	${DST}/emacs.desktop	444
 
 
-SFL="usr/share/emacs/22.1"
-DST="${ROOT}/usr/share/emacs/22.1"
-
-
-SFL="usr/share/emacs/22.1/etc"
-DST="${ROOT}/usr/share/emacs/22.1/etc"
+SFL="usr/share/emacs/23.1/etc"
+DST="${ROOT}/usr/share/emacs/23.1/etc"
+_install N ${SFL}/AUTHORS	${DST}/AUTHORS	444
 _install N ${SFL}/BABYL	${DST}/BABYL	444
 _install N ${SFL}/CENSORSHIP	${DST}/CENSORSHIP	444
+_install N ${SFL}/CONTRIBUTE	${DST}/CONTRIBUTE	444
 _install N ${SFL}/COOKIES	${DST}/COOKIES	444
 _install N ${SFL}/COPYING	${DST}/COPYING	444
 _install N ${SFL}/DEBUG	${DST}/DEBUG	444
 _install N ${SFL}/DEVEL.HUMOR	${DST}/DEVEL.HUMOR	444
 _install N ${SFL}/DISTRIB	${DST}/DISTRIB	444
-_install N ${SFL}/DOC-22.1.1	${DST}/DOC-22.1.1	444
+_install N ${SFL}/DOC-23.1.1	${DST}/DOC-23.1.1	444
 _install N ${SFL}/ERC-NEWS	${DST}/ERC-NEWS	444
 _install N ${SFL}/ETAGS.EBNF	${DST}/ETAGS.EBNF	444
 _install N ${SFL}/ETAGS.README	${DST}/ETAGS.README	444
@@ -168,6 +159,8 @@
 _install N ${SFL}/NEWS.19	${DST}/NEWS.19	444
 _install N ${SFL}/NEWS.20	${DST}/NEWS.20	444
 _install N ${SFL}/NEWS.21	${DST}/NEWS.21	444
+_install N ${SFL}/NEWS.22	${DST}/NEWS.22	444
+_install N ${SFL}/NXML-NEWS	${DST}/NXML-NEWS	444
 _install N ${SFL}/ORDERS	${DST}/ORDERS	444
 _install N ${SFL}/PROBLEMS	${DST}/PROBLEMS	444
 _install N ${SFL}/README	${DST}/README	444
@@ -175,117 +168,194 @@
 _install N ${SFL}/TERMS	${DST}/TERMS	444
 _install N ${SFL}/THE-GNU-PROJECT	${DST}/THE-GNU-PROJECT	444
 _install N ${SFL}/TODO	${DST}/TODO	444
-_install N ${SFL}/TUTORIAL	${DST}/TUTORIAL	444
-_install N ${SFL}/TUTORIAL.bg	${DST}/TUTORIAL.bg	444
-_install N ${SFL}/TUTORIAL.cn	${DST}/TUTORIAL.cn	444
-_install N ${SFL}/TUTORIAL.cs	${DST}/TUTORIAL.cs	444
-_install N ${SFL}/TUTORIAL.de	${DST}/TUTORIAL.de	444
-_install N ${SFL}/TUTORIAL.eo	${DST}/TUTORIAL.eo	444
-_install N ${SFL}/TUTORIAL.es	${DST}/TUTORIAL.es	444
-_install N ${SFL}/TUTORIAL.fr	${DST}/TUTORIAL.fr	444
-_install N ${SFL}/TUTORIAL.it	${DST}/TUTORIAL.it	444
-_install N ${SFL}/TUTORIAL.ja	${DST}/TUTORIAL.ja	444
-_install N ${SFL}/TUTORIAL.ko	${DST}/TUTORIAL.ko	444
-_install N ${SFL}/TUTORIAL.nl	${DST}/TUTORIAL.nl	444
-_install N ${SFL}/TUTORIAL.pl	${DST}/TUTORIAL.pl	444
-_install N ${SFL}/TUTORIAL.pt_BR	${DST}/TUTORIAL.pt_BR	444
-_install N ${SFL}/TUTORIAL.ro	${DST}/TUTORIAL.ro	444
-_install N ${SFL}/TUTORIAL.ru	${DST}/TUTORIAL.ru	444
-_install N ${SFL}/TUTORIAL.sk	${DST}/TUTORIAL.sk	444
-_install N ${SFL}/TUTORIAL.sl	${DST}/TUTORIAL.sl	444
-_install N ${SFL}/TUTORIAL.sv	${DST}/TUTORIAL.sv	444
-_install N ${SFL}/TUTORIAL.th	${DST}/TUTORIAL.th	444
-_install N ${SFL}/TUTORIAL.translators	${DST}/TUTORIAL.translators	444
-_install N ${SFL}/TUTORIAL.zh	${DST}/TUTORIAL.zh	444
 _install N ${SFL}/WHY-FREE	${DST}/WHY-FREE	444
-_install N ${SFL}/calccard.ps	${DST}/calccard.ps	444
-_install N ${SFL}/calccard.tex	${DST}/calccard.tex	444
 _install N ${SFL}/celibacy.1	${DST}/celibacy.1	444
 _install N ${SFL}/compilation.txt	${DST}/compilation.txt	444
 _install N ${SFL}/condom.1	${DST}/condom.1	444
 _install N ${SFL}/copying.paper	${DST}/copying.paper	444
-_install N ${SFL}/cs-dired-ref.ps	${DST}/cs-dired-ref.ps	444
-_install N ${SFL}/cs-dired-ref.tex	${DST}/cs-dired-ref.tex	444
-_install N ${SFL}/cs-refcard.ps	${DST}/cs-refcard.ps	444
-_install N ${SFL}/cs-refcard.tex	${DST}/cs-refcard.tex	444
-_install N ${SFL}/cs-survival.tex	${DST}/cs-survival.tex	444
-_install N ${SFL}/ctags.1	${DST}/ctags.1	444
-_install N ${SFL}/de-refcard.ps	${DST}/de-refcard.ps	444
-_install N ${SFL}/de-refcard.tex	${DST}/de-refcard.tex	444
-_install N ${SFL}/dired-ref.ps	${DST}/dired-ref.ps	444
-_install N ${SFL}/dired-ref.tex	${DST}/dired-ref.tex	444
 _install N ${SFL}/echo.msg	${DST}/echo.msg	444
 _install N ${SFL}/edt-user.doc	${DST}/edt-user.doc	444
 _install N ${SFL}/emacs-buffer.gdb	${DST}/emacs-buffer.gdb	444
-_install N ${SFL}/emacs.1	${DST}/emacs.1	444
 _install N ${SFL}/emacs.bash	${DST}/emacs.bash	444
 _install N ${SFL}/emacs.csh	${DST}/emacs.csh	444
+_install N ${SFL}/emacs.desktop	${DST}/emacs.desktop	444
 _install N ${SFL}/emacs.icon	${DST}/emacs.icon	444
 _install N ${SFL}/emacs.py	${DST}/emacs.py	444
-_install N ${SFL}/emacsclient.1	${DST}/emacsclient.1	444
-_install N ${SFL}/emacstool.1	${DST}/emacstool.1	444
+_install N ${SFL}/emacs2.py	${DST}/emacs2.py	444
+_install N ${SFL}/emacs3.py	${DST}/emacs3.py	444
 _install N ${SFL}/enriched.doc	${DST}/enriched.doc	444
-_install N ${SFL}/etags.1	${DST}/etags.1	444
-_install N ${SFL}/fr-drdref.ps	${DST}/fr-drdref.ps	444
-_install N ${SFL}/fr-drdref.tex	${DST}/fr-drdref.tex	444
-_install N ${SFL}/fr-refcard.ps	${DST}/fr-refcard.ps	444
-_install N ${SFL}/fr-refcard.tex	${DST}/fr-refcard.tex	444
-_install N ${SFL}/fr-survival.tex	${DST}/fr-survival.tex	444
+_install N ${SFL}/forms-d2.dat	${DST}/forms-d2.dat	444
 _install N ${SFL}/future-bug	${DST}/future-bug	444
-_install N ${SFL}/gnus-booklet.ps	${DST}/gnus-booklet.ps	444
-_install N ${SFL}/gnus-logo.eps	${DST}/gnus-logo.eps	444
-_install N ${SFL}/gnus-refcard.ps	${DST}/gnus-refcard.ps	444
-_install N ${SFL}/gnus-refcard.tex	${DST}/gnus-refcard.tex	444
 _install N ${SFL}/gnus-tut.txt	${DST}/gnus-tut.txt	444
-_install N ${SFL}/gnus.pbm	${DST}/gnus.pbm	444
 _install N ${SFL}/grep.txt	${DST}/grep.txt	444
-_install N ${SFL}/letter.pbm	${DST}/letter.pbm	444
-_install N ${SFL}/letter.xpm	${DST}/letter.xpm	444
 _install N ${SFL}/ms-kermit	${DST}/ms-kermit	444
-_install N ${SFL}/orgcard.ps	${DST}/orgcard.ps	444
-_install N ${SFL}/orgcard.tex	${DST}/orgcard.tex	444
-_install N ${SFL}/pl-refcard.ps	${DST}/pl-refcard.ps	444
-_install N ${SFL}/pl-refcard.tex	${DST}/pl-refcard.tex	444
 _install N ${SFL}/ps-prin0.ps	${DST}/ps-prin0.ps	444
 _install N ${SFL}/ps-prin1.ps	${DST}/ps-prin1.ps	444
-_install N ${SFL}/pt-br-refcard.ps	${DST}/pt-br-refcard.ps	444
-_install N ${SFL}/pt-br-refcard.tex	${DST}/pt-br-refcard.tex	444
-_install N ${SFL}/refcard.ps	${DST}/refcard.ps	444
-_install N ${SFL}/refcard.tex	${DST}/refcard.tex	444
 _install N ${SFL}/rgb.txt	${DST}/rgb.txt	444
-_install N ${SFL}/ru-refcard.ps	${DST}/ru-refcard.ps	444
-_install N ${SFL}/ru-refcard.tex	${DST}/ru-refcard.tex	444
 _install N ${SFL}/ses-example.ses	${DST}/ses-example.ses	444
 _install N ${SFL}/sex.6	${DST}/sex.6	444
-_install N ${SFL}/sk-dired-ref.ps	${DST}/sk-dired-ref.ps	444
-_install N ${SFL}/sk-dired-ref.tex	${DST}/sk-dired-ref.tex	444
-_install N ${SFL}/sk-refcard.ps	${DST}/sk-refcard.ps	444
-_install N ${SFL}/sk-refcard.tex	${DST}/sk-refcard.tex	444
-_install N ${SFL}/sk-survival.tex	${DST}/sk-survival.tex	444
-_install N ${SFL}/splash.pbm	${DST}/splash.pbm	444
-_install N ${SFL}/splash.xpm	${DST}/splash.xpm	444
-_install N ${SFL}/splash8.xpm	${DST}/splash8.xpm	444
 _install N ${SFL}/spook.lines	${DST}/spook.lines	444
-_install N ${SFL}/survival.tex	${DST}/survival.tex	444
-_install N ${SFL}/termcap.src	${DST}/termcap.src	444
-_install N ${SFL}/vipcard.tex	${DST}/vipcard.tex	444
-_install N ${SFL}/viperCard.tex	${DST}/viperCard.tex	444
 _install N ${SFL}/yow.lines	${DST}/yow.lines	444
 
 
-SFL="usr/share/emacs/22.1/etc/e"
-DST="${ROOT}/usr/share/emacs/22.1/etc/e"
+SFL="usr/share/emacs/23.1/etc/charsets"
+DST="${ROOT}/usr/share/emacs/23.1/etc/charsets"
+_install N ${SFL}/8859-10.map	${DST}/8859-10.map	444
+_install N ${SFL}/8859-11.map	${DST}/8859-11.map	444
+_install N ${SFL}/8859-13.map	${DST}/8859-13.map	444
+_install N ${SFL}/8859-14.map	${DST}/8859-14.map	444
+_install N ${SFL}/8859-15.map	${DST}/8859-15.map	444
+_install N ${SFL}/8859-16.map	${DST}/8859-16.map	444
+_install N ${SFL}/8859-2.map	${DST}/8859-2.map	444
+_install N ${SFL}/8859-3.map	${DST}/8859-3.map	444
+_install N ${SFL}/8859-4.map	${DST}/8859-4.map	444
+_install N ${SFL}/8859-5.map	${DST}/8859-5.map	444
+_install N ${SFL}/8859-6.map	${DST}/8859-6.map	444
+_install N ${SFL}/8859-7.map	${DST}/8859-7.map	444
+_install N ${SFL}/8859-8.map	${DST}/8859-8.map	444
+_install N ${SFL}/8859-9.map	${DST}/8859-9.map	444
+_install N ${SFL}/ALTERNATIVNYJ.map	${DST}/ALTERNATIVNYJ.map	444
+_install N ${SFL}/BIG5-1.map	${DST}/BIG5-1.map	444
+_install N ${SFL}/BIG5-2.map	${DST}/BIG5-2.map	444
+_install N ${SFL}/BIG5-HKSCS.map	${DST}/BIG5-HKSCS.map	444
+_install N ${SFL}/BIG5.map	${DST}/BIG5.map	444
+_install N ${SFL}/CNS-1.map	${DST}/CNS-1.map	444
+_install N ${SFL}/CNS-2.map	${DST}/CNS-2.map	444
+_install N ${SFL}/CNS-3.map	${DST}/CNS-3.map	444
+_install N ${SFL}/CNS-4.map	${DST}/CNS-4.map	444
+_install N ${SFL}/CNS-5.map	${DST}/CNS-5.map	444
+_install N ${SFL}/CNS-6.map	${DST}/CNS-6.map	444
+_install N ${SFL}/CNS-7.map	${DST}/CNS-7.map	444
+_install N ${SFL}/CNS-F.map	${DST}/CNS-F.map	444
+_install N ${SFL}/CP10007.map	${DST}/CP10007.map	444
+_install N ${SFL}/CP1125.map	${DST}/CP1125.map	444
+_install N ${SFL}/CP1250.map	${DST}/CP1250.map	444
+_install N ${SFL}/CP1251.map	${DST}/CP1251.map	444
+_install N ${SFL}/CP1252.map	${DST}/CP1252.map	444
+_install N ${SFL}/CP1253.map	${DST}/CP1253.map	444
+_install N ${SFL}/CP1254.map	${DST}/CP1254.map	444
+_install N ${SFL}/CP1255.map	${DST}/CP1255.map	444
+_install N ${SFL}/CP1256.map	${DST}/CP1256.map	444
+_install N ${SFL}/CP1257.map	${DST}/CP1257.map	444
+_install N ${SFL}/CP1258.map	${DST}/CP1258.map	444
+_install N ${SFL}/CP720.map	${DST}/CP720.map	444
+_install N ${SFL}/CP737.map	${DST}/CP737.map	444
+_install N ${SFL}/CP775.map	${DST}/CP775.map	444
+_install N ${SFL}/CP858.map	${DST}/CP858.map	444
+_install N ${SFL}/CP932-2BYTE.map	${DST}/CP932-2BYTE.map	444
+_install N ${SFL}/CP949-2BYTE.map	${DST}/CP949-2BYTE.map	444
+_install N ${SFL}/EBCDICUK.map	${DST}/EBCDICUK.map	444
+_install N ${SFL}/EBCDICUS.map	${DST}/EBCDICUS.map	444
+_install N ${SFL}/GB180302.map	${DST}/GB180302.map	444
+_install N ${SFL}/GB180304.map	${DST}/GB180304.map	444
+_install N ${SFL}/GB2312.map	${DST}/GB2312.map	444
+_install N ${SFL}/GBK.map	${DST}/GBK.map	444
+_install N ${SFL}/HP-ROMAN8.map	${DST}/HP-ROMAN8.map	444
+_install N ${SFL}/IBM037.map	${DST}/IBM037.map	444
+_install N ${SFL}/IBM038.map	${DST}/IBM038.map	444
+_install N ${SFL}/IBM1004.map	${DST}/IBM1004.map	444
+_install N ${SFL}/IBM1026.map	${DST}/IBM1026.map	444
+_install N ${SFL}/IBM1047.map	${DST}/IBM1047.map	444
+_install N ${SFL}/IBM256.map	${DST}/IBM256.map	444
+_install N ${SFL}/IBM273.map	${DST}/IBM273.map	444
+_install N ${SFL}/IBM274.map	${DST}/IBM274.map	444
+_install N ${SFL}/IBM275.map	${DST}/IBM275.map	444
+_install N ${SFL}/IBM277.map	${DST}/IBM277.map	444
+_install N ${SFL}/IBM278.map	${DST}/IBM278.map	444
+_install N ${SFL}/IBM280.map	${DST}/IBM280.map	444
+_install N ${SFL}/IBM281.map	${DST}/IBM281.map	444
+_install N ${SFL}/IBM284.map	${DST}/IBM284.map	444
+_install N ${SFL}/IBM285.map	${DST}/IBM285.map	444
+_install N ${SFL}/IBM290.map	${DST}/IBM290.map	444
+_install N ${SFL}/IBM297.map	${DST}/IBM297.map	444
+_install N ${SFL}/IBM420.map	${DST}/IBM420.map	444
+_install N ${SFL}/IBM423.map	${DST}/IBM423.map	444
+_install N ${SFL}/IBM424.map	${DST}/IBM424.map	444
+_install N ${SFL}/IBM437.map	${DST}/IBM437.map	444
+_install N ${SFL}/IBM500.map	${DST}/IBM500.map	444
+_install N ${SFL}/IBM850.map	${DST}/IBM850.map	444
+_install N ${SFL}/IBM851.map	${DST}/IBM851.map	444
+_install N ${SFL}/IBM852.map	${DST}/IBM852.map	444
+_install N ${SFL}/IBM855.map	${DST}/IBM855.map	444
+_install N ${SFL}/IBM856.map	${DST}/IBM856.map	444
+_install N ${SFL}/IBM857.map	${DST}/IBM857.map	444
+_install N ${SFL}/IBM860.map	${DST}/IBM860.map	444
+_install N ${SFL}/IBM861.map	${DST}/IBM861.map	444
+_install N ${SFL}/IBM862.map	${DST}/IBM862.map	444
+_install N ${SFL}/IBM863.map	${DST}/IBM863.map	444
+_install N ${SFL}/IBM864.map	${DST}/IBM864.map	444
+_install N ${SFL}/IBM865.map	${DST}/IBM865.map	444
+_install N ${SFL}/IBM866.map	${DST}/IBM866.map	444
+_install N ${SFL}/IBM868.map	${DST}/IBM868.map	444
+_install N ${SFL}/IBM869.map	${DST}/IBM869.map	444
+_install N ${SFL}/IBM870.map	${DST}/IBM870.map	444
+_install N ${SFL}/IBM871.map	${DST}/IBM871.map	444
+_install N ${SFL}/IBM874.map	${DST}/IBM874.map	444
+_install N ${SFL}/IBM875.map	${DST}/IBM875.map	444
+_install N ${SFL}/IBM880.map	${DST}/IBM880.map	444
+_install N ${SFL}/IBM891.map	${DST}/IBM891.map	444
+_install N ${SFL}/IBM903.map	${DST}/IBM903.map	444
+_install N ${SFL}/IBM904.map	${DST}/IBM904.map	444
+_install N ${SFL}/IBM905.map	${DST}/IBM905.map	444
+_install N ${SFL}/IBM918.map	${DST}/IBM918.map	444
+_install N ${SFL}/JISC6226.map	${DST}/JISC6226.map	444
+_install N ${SFL}/JISX0201.map	${DST}/JISX0201.map	444
+_install N ${SFL}/JISX0208.map	${DST}/JISX0208.map	444
+_install N ${SFL}/JISX0212.map	${DST}/JISX0212.map	444
+_install N ${SFL}/JISX2131.map	${DST}/JISX2131.map	444
+_install N ${SFL}/JISX2132.map	${DST}/JISX2132.map	444
+_install N ${SFL}/JISX213A.map	${DST}/JISX213A.map	444
+_install N ${SFL}/JOHAB.map	${DST}/JOHAB.map	444
+_install N ${SFL}/KA-ACADEMY.map	${DST}/KA-ACADEMY.map	444
+_install N ${SFL}/KA-PS.map	${DST}/KA-PS.map	444
+_install N ${SFL}/KOI-8.map	${DST}/KOI-8.map	444
+_install N ${SFL}/KOI8-R.map	${DST}/KOI8-R.map	444
+_install N ${SFL}/KOI8-T.map	${DST}/KOI8-T.map	444
+_install N ${SFL}/KOI8-U.map	${DST}/KOI8-U.map	444
+_install N ${SFL}/KSC5601.map	${DST}/KSC5601.map	444
+_install N ${SFL}/KSC5636.map	${DST}/KSC5636.map	444
+_install N ${SFL}/MACINTOSH.map	${DST}/MACINTOSH.map	444
+_install N ${SFL}/MIK.map	${DST}/MIK.map	444
+_install N ${SFL}/MULE-ethiopic.map	${DST}/MULE-ethiopic.map	444
+_install N ${SFL}/MULE-ipa.map	${DST}/MULE-ipa.map	444
+_install N ${SFL}/MULE-is13194.map	${DST}/MULE-is13194.map	444
+_install N ${SFL}/MULE-lviscii.map	${DST}/MULE-lviscii.map	444
+_install N ${SFL}/MULE-sisheng.map	${DST}/MULE-sisheng.map	444
+_install N ${SFL}/MULE-tibetan.map	${DST}/MULE-tibetan.map	444
+_install N ${SFL}/MULE-uviscii.map	${DST}/MULE-uviscii.map	444
+_install N ${SFL}/NEXTSTEP.map	${DST}/NEXTSTEP.map	444
+_install N ${SFL}/PTCP154.map	${DST}/PTCP154.map	444
+_install N ${SFL}/README	${DST}/README	444
+_install N ${SFL}/TIS-620.map	${DST}/TIS-620.map	444
+_install N ${SFL}/VISCII.map	${DST}/VISCII.map	444
+_install N ${SFL}/VSCII-2.map	${DST}/VSCII-2.map	444
+_install N ${SFL}/VSCII.map	${DST}/VSCII.map	444
+_install N ${SFL}/stdenc.map	${DST}/stdenc.map	444
+_install N ${SFL}/symbol.map	${DST}/symbol.map	444
+
+
+SFL="usr/share/emacs/23.1/etc/e"
+DST="${ROOT}/usr/share/emacs/23.1/etc/e"
+_install N ${SFL}/README	${DST}/README	444
 _install N ${SFL}/eterm-color	${DST}/eterm-color	444
 _install N ${SFL}/eterm-color.ti	${DST}/eterm-color.ti	444
 
 
-SFL="usr/share/emacs/22.1/etc/images"
-DST="${ROOT}/usr/share/emacs/22.1/etc/images"
+SFL="usr/share/emacs/23.1/etc/gnus"
+DST="${ROOT}/usr/share/emacs/23.1/etc/gnus"
+_install N ${SFL}/gnus-setup.ast	${DST}/gnus-setup.ast	444
+_install N ${SFL}/news-server.ast	${DST}/news-server.ast	444
+
+
+SFL="usr/share/emacs/23.1/etc/images"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images"
 _install N ${SFL}/README	${DST}/README	444
 _install N ${SFL}/attach.pbm	${DST}/attach.pbm	444
 _install N ${SFL}/attach.xpm	${DST}/attach.xpm	444
 _install N ${SFL}/back-arrow.pbm	${DST}/back-arrow.pbm	444
 _install N ${SFL}/back-arrow.xpm	${DST}/back-arrow.xpm	444
+_install N ${SFL}/bookmark_add.pbm	${DST}/bookmark_add.pbm	444
+_install N ${SFL}/bookmark_add.xpm	${DST}/bookmark_add.xpm	444
 _install N ${SFL}/cancel.pbm	${DST}/cancel.pbm	444
 _install N ${SFL}/cancel.xpm	${DST}/cancel.xpm	444
 _install N ${SFL}/close.pbm	${DST}/close.pbm	444
@@ -309,6 +379,7 @@
 _install N ${SFL}/exit.xpm	${DST}/exit.xpm	444
 _install N ${SFL}/fwd-arrow.pbm	${DST}/fwd-arrow.pbm	444
 _install N ${SFL}/fwd-arrow.xpm	${DST}/fwd-arrow.xpm	444
+_install N ${SFL}/gnus.pbm	${DST}/gnus.pbm	444
 _install N ${SFL}/help.pbm	${DST}/help.pbm	444
 _install N ${SFL}/help.xpm	${DST}/help.xpm	444
 _install N ${SFL}/home.pbm	${DST}/home.pbm	444
@@ -321,6 +392,8 @@
 _install N ${SFL}/jump-to.xpm	${DST}/jump-to.xpm	444
 _install N ${SFL}/left-arrow.pbm	${DST}/left-arrow.pbm	444
 _install N ${SFL}/left-arrow.xpm	${DST}/left-arrow.xpm	444
+_install N ${SFL}/letter.pbm	${DST}/letter.pbm	444
+_install N ${SFL}/letter.xpm	${DST}/letter.xpm	444
 _install N ${SFL}/lock-broken.xpm	${DST}/lock-broken.xpm	444
 _install N ${SFL}/lock-ok.xpm	${DST}/lock-ok.xpm	444
 _install N ${SFL}/lock.xpm	${DST}/lock.xpm	444
@@ -364,6 +437,10 @@
 _install N ${SFL}/sort-row-ascending.xpm	${DST}/sort-row-ascending.xpm	444
 _install N ${SFL}/spell.pbm	${DST}/spell.pbm	444
 _install N ${SFL}/spell.xpm	${DST}/spell.xpm	444
+_install N ${SFL}/splash.pbm	${DST}/splash.pbm	444
+_install N ${SFL}/splash.png	${DST}/splash.png	444
+_install N ${SFL}/splash.svg	${DST}/splash.svg	444
+_install N ${SFL}/splash.xpm	${DST}/splash.xpm	444
 _install N ${SFL}/undo.pbm	${DST}/undo.pbm	444
 _install N ${SFL}/undo.xpm	${DST}/undo.xpm	444
 _install N ${SFL}/up-arrow.pbm	${DST}/up-arrow.pbm	444
@@ -375,8 +452,17 @@
 _install N ${SFL}/zoom-out.xpm	${DST}/zoom-out.xpm	444
 
 
-SFL="usr/share/emacs/22.1/etc/images/ezimage"
-DST="${ROOT}/usr/share/emacs/22.1/etc/images/ezimage"
+SFL="usr/share/emacs/23.1/etc/images/custom"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/custom"
+_install N ${SFL}/README	${DST}/README	444
+_install N ${SFL}/down-pushed.xpm	${DST}/down-pushed.xpm	444
+_install N ${SFL}/down.xpm	${DST}/down.xpm	444
+_install N ${SFL}/right-pushed.xpm	${DST}/right-pushed.xpm	444
+_install N ${SFL}/right.xpm	${DST}/right.xpm	444
+
+
+SFL="usr/share/emacs/23.1/etc/images/ezimage"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/ezimage"
 _install N ${SFL}/README	${DST}/README	444
 _install N ${SFL}/bits.xpm	${DST}/bits.xpm	444
 _install N ${SFL}/bitsbang.xpm	${DST}/bitsbang.xpm	444
@@ -407,8 +493,8 @@
 _install N ${SFL}/unlock.xpm	${DST}/unlock.xpm	444
 
 
-SFL="usr/share/emacs/22.1/etc/images/gnus"
-DST="${ROOT}/usr/share/emacs/22.1/etc/images/gnus"
+SFL="usr/share/emacs/23.1/etc/images/gnus"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/gnus"
 _install N ${SFL}/README	${DST}/README	444
 _install N ${SFL}/catchup.pbm	${DST}/catchup.pbm	444
 _install N ${SFL}/catchup.xpm	${DST}/catchup.xpm	444
@@ -430,6 +516,8 @@
 _install N ${SFL}/gnntg.xpm	${DST}/gnntg.xpm	444
 _install N ${SFL}/gnus-pointer.xbm	${DST}/gnus-pointer.xbm	444
 _install N ${SFL}/gnus-pointer.xpm	${DST}/gnus-pointer.xpm	444
+_install N ${SFL}/gnus.png	${DST}/gnus.png	444
+_install N ${SFL}/gnus.svg	${DST}/gnus.svg	444
 _install N ${SFL}/gnus.xbm	${DST}/gnus.xbm	444
 _install N ${SFL}/gnus.xpm	${DST}/gnus.xpm	444
 _install N ${SFL}/important.xpm	${DST}/important.xpm	444
@@ -437,6 +525,7 @@
 _install N ${SFL}/kill-group.xpm	${DST}/kill-group.xpm	444
 _install N ${SFL}/mail-reply.pbm	${DST}/mail-reply.pbm	444
 _install N ${SFL}/mail-reply.xpm	${DST}/mail-reply.xpm	444
+_install N ${SFL}/mail-send.xpm	${DST}/mail-send.xpm	444
 _install N ${SFL}/next-ur.pbm	${DST}/next-ur.pbm	444
 _install N ${SFL}/next-ur.xpm	${DST}/next-ur.xpm	444
 _install N ${SFL}/post.pbm	${DST}/post.pbm	444
@@ -468,8 +557,8 @@
 _install N ${SFL}/uu-post.xpm	${DST}/uu-post.xpm	444
 
 
-SFL="usr/share/emacs/22.1/etc/images/gud"
-DST="${ROOT}/usr/share/emacs/22.1/etc/images/gud"
+SFL="usr/share/emacs/23.1/etc/images/gud"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/gud"
 _install N ${SFL}/README	${DST}/README	444
 _install N ${SFL}/break.pbm	${DST}/break.pbm	444
 _install N ${SFL}/break.xpm	${DST}/break.xpm	444
@@ -509,17 +598,52 @@
 _install N ${SFL}/watch.xpm	${DST}/watch.xpm	444
 
 
-SFL="usr/share/emacs/22.1/etc/images/icons"
-DST="${ROOT}/usr/share/emacs/22.1/etc/images/icons"
+SFL="usr/share/emacs/23.1/etc/images/icons"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/icons"
 _install N ${SFL}/README	${DST}/README	444
-_install N ${SFL}/emacs_16.png	${DST}/emacs_16.png	444
-_install N ${SFL}/emacs_24.png	${DST}/emacs_24.png	444
-_install N ${SFL}/emacs_32.png	${DST}/emacs_32.png	444
-_install N ${SFL}/emacs_48.png	${DST}/emacs_48.png	444
+
+
+SFL="usr/share/emacs/23.1/etc/images/icons/hicolor/128x128/apps"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/icons/hicolor/128x128/apps"
+_install N ${SFL}/emacs.png	${DST}/emacs.png	444
+
+
+SFL="usr/share/emacs/23.1/etc/images/icons/hicolor/16x16/apps"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/icons/hicolor/16x16/apps"
+_install N ${SFL}/emacs.png	${DST}/emacs.png	444
+_install N ${SFL}/emacs22.png	${DST}/emacs22.png	444
+
+
+SFL="usr/share/emacs/23.1/etc/images/icons/hicolor/24x24/apps"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/icons/hicolor/24x24/apps"
+_install N ${SFL}/emacs.png	${DST}/emacs.png	444
+_install N ${SFL}/emacs22.png	${DST}/emacs22.png	444
 
 
-SFL="usr/share/emacs/22.1/etc/images/low-color"
-DST="${ROOT}/usr/share/emacs/22.1/etc/images/low-color"
+SFL="usr/share/emacs/23.1/etc/images/icons/hicolor/32x32/apps"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/icons/hicolor/32x32/apps"
+_install N ${SFL}/emacs.png	${DST}/emacs.png	444
+_install N ${SFL}/emacs22.png	${DST}/emacs22.png	444
+
+
+SFL="usr/share/emacs/23.1/etc/images/icons/hicolor/48x48/apps"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/icons/hicolor/48x48/apps"
+_install N ${SFL}/emacs.png	${DST}/emacs.png	444
+_install N ${SFL}/emacs22.png	${DST}/emacs22.png	444
+
+
+SFL="usr/share/emacs/23.1/etc/images/icons/hicolor/scalable/apps"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/icons/hicolor/scalable/apps"
+_install N ${SFL}/emacs.svg	${DST}/emacs.svg	444
+
+
+SFL="usr/share/emacs/23.1/etc/images/icons/hicolor/scalable/mimetypes"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/icons/hicolor/scalable/mimetypes"
+_install N ${SFL}/emacs-document.svg	${DST}/emacs-document.svg	444
+
+
+SFL="usr/share/emacs/23.1/etc/images/low-color"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/low-color"
 _install N ${SFL}/README	${DST}/README	444
 _install N ${SFL}/back-arrow.xpm	${DST}/back-arrow.xpm	444
 _install N ${SFL}/copy.xpm	${DST}/copy.xpm	444
@@ -547,8 +671,8 @@
 _install N ${SFL}/up-node.xpm	${DST}/up-node.xpm	444
 
 
-SFL="usr/share/emacs/22.1/etc/images/mail"
-DST="${ROOT}/usr/share/emacs/22.1/etc/images/mail"
+SFL="usr/share/emacs/23.1/etc/images/mail"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/mail"
 _install N ${SFL}/README	${DST}/README	444
 _install N ${SFL}/compose.pbm	${DST}/compose.pbm	444
 _install N ${SFL}/compose.xpm	${DST}/compose.xpm	444
@@ -580,8 +704,8 @@
 _install N ${SFL}/spam.xpm	${DST}/spam.xpm	444
 
 
-SFL="usr/share/emacs/22.1/etc/images/smilies"
-DST="${ROOT}/usr/share/emacs/22.1/etc/images/smilies"
+SFL="usr/share/emacs/23.1/etc/images/smilies"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/smilies"
 _install N ${SFL}/README	${DST}/README	444
 _install N ${SFL}/blink.pbm	${DST}/blink.pbm	444
 _install N ${SFL}/blink.xpm	${DST}/blink.xpm	444
@@ -602,12 +726,67 @@
 _install N ${SFL}/wry.xpm	${DST}/wry.xpm	444
 
 
-SFL="usr/share/emacs/22.1/etc/tree-widget"
-DST="${ROOT}/usr/share/emacs/22.1/etc/tree-widget"
+SFL="usr/share/emacs/23.1/etc/images/smilies/grayscale"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/smilies/grayscale"
+_install N ${SFL}/README	${DST}/README	444
+_install N ${SFL}/blink.xpm	${DST}/blink.xpm	444
+_install N ${SFL}/braindamaged.xpm	${DST}/braindamaged.xpm	444
+_install N ${SFL}/cry.xpm	${DST}/cry.xpm	444
+_install N ${SFL}/dead.xpm	${DST}/dead.xpm	444
+_install N ${SFL}/evil.xpm	${DST}/evil.xpm	444
+_install N ${SFL}/forced.xpm	${DST}/forced.xpm	444
+_install N ${SFL}/frown.xpm	${DST}/frown.xpm	444
+_install N ${SFL}/grin.xpm	${DST}/grin.xpm	444
+_install N ${SFL}/indifferent.xpm	${DST}/indifferent.xpm	444
+_install N ${SFL}/reverse-smile.xpm	${DST}/reverse-smile.xpm	444
+_install N ${SFL}/sad.xpm	${DST}/sad.xpm	444
+_install N ${SFL}/smile.xpm	${DST}/smile.xpm	444
+_install N ${SFL}/wry.xpm	${DST}/wry.xpm	444
 
 
-SFL="usr/share/emacs/22.1/etc/tree-widget/default"
-DST="${ROOT}/usr/share/emacs/22.1/etc/tree-widget/default"
+SFL="usr/share/emacs/23.1/etc/images/smilies/medium"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/smilies/medium"
+_install N ${SFL}/README	${DST}/README	444
+_install N ${SFL}/blink.xpm	${DST}/blink.xpm	444
+_install N ${SFL}/braindamaged.xpm	${DST}/braindamaged.xpm	444
+_install N ${SFL}/cry.xpm	${DST}/cry.xpm	444
+_install N ${SFL}/dead.xpm	${DST}/dead.xpm	444
+_install N ${SFL}/evil.xpm	${DST}/evil.xpm	444
+_install N ${SFL}/forced.xpm	${DST}/forced.xpm	444
+_install N ${SFL}/frown.xpm	${DST}/frown.xpm	444
+_install N ${SFL}/grin.xpm	${DST}/grin.xpm	444
+_install N ${SFL}/indifferent.xpm	${DST}/indifferent.xpm	444
+_install N ${SFL}/reverse-smile.xpm	${DST}/reverse-smile.xpm	444
+_install N ${SFL}/sad.xpm	${DST}/sad.xpm	444
+_install N ${SFL}/smile.xpm	${DST}/smile.xpm	444
+_install N ${SFL}/wry.xpm	${DST}/wry.xpm	444
+
+
+SFL="usr/share/emacs/23.1/etc/images/tree-widget/default"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/tree-widget/default"
+_install N ${SFL}/README	${DST}/README	444
+_install N ${SFL}/close.png	${DST}/close.png	444
+_install N ${SFL}/close.xpm	${DST}/close.xpm	444
+_install N ${SFL}/empty.png	${DST}/empty.png	444
+_install N ${SFL}/empty.xpm	${DST}/empty.xpm	444
+_install N ${SFL}/end-guide.png	${DST}/end-guide.png	444
+_install N ${SFL}/end-guide.xpm	${DST}/end-guide.xpm	444
+_install N ${SFL}/guide.png	${DST}/guide.png	444
+_install N ${SFL}/guide.xpm	${DST}/guide.xpm	444
+_install N ${SFL}/handle.png	${DST}/handle.png	444
+_install N ${SFL}/handle.xpm	${DST}/handle.xpm	444
+_install N ${SFL}/leaf.png	${DST}/leaf.png	444
+_install N ${SFL}/leaf.xpm	${DST}/leaf.xpm	444
+_install N ${SFL}/no-guide.png	${DST}/no-guide.png	444
+_install N ${SFL}/no-guide.xpm	${DST}/no-guide.xpm	444
+_install N ${SFL}/no-handle.png	${DST}/no-handle.png	444
+_install N ${SFL}/no-handle.xpm	${DST}/no-handle.xpm	444
+_install N ${SFL}/open.png	${DST}/open.png	444
+_install N ${SFL}/open.xpm	${DST}/open.xpm	444
+
+
+SFL="usr/share/emacs/23.1/etc/images/tree-widget/folder"
+DST="${ROOT}/usr/share/emacs/23.1/etc/images/tree-widget/folder"
 _install N ${SFL}/README	${DST}/README	444
 _install N ${SFL}/close.png	${DST}/close.png	444
 _install N ${SFL}/close.xpm	${DST}/close.xpm	444
@@ -629,42 +808,247 @@
 _install N ${SFL}/open.xpm	${DST}/open.xpm	444
 
 
-SFL="usr/share/emacs/22.1/etc/tree-widget/folder"
-DST="${ROOT}/usr/share/emacs/22.1/etc/tree-widget/folder"
+SFL="usr/share/emacs/23.1/etc/nxml"
+DST="${ROOT}/usr/share/emacs/23.1/etc/nxml"
+_install N ${SFL}/00000-0007F.el	${DST}/00000-0007F.el	444
+_install N ${SFL}/00080-000FF.el	${DST}/00080-000FF.el	444
+_install N ${SFL}/00100-0017F.el	${DST}/00100-0017F.el	444
+_install N ${SFL}/00180-0024F.el	${DST}/00180-0024F.el	444
+_install N ${SFL}/00250-002AF.el	${DST}/00250-002AF.el	444
+_install N ${SFL}/002B0-002FF.el	${DST}/002B0-002FF.el	444
+_install N ${SFL}/00300-0036F.el	${DST}/00300-0036F.el	444
+_install N ${SFL}/00370-003FF.el	${DST}/00370-003FF.el	444
+_install N ${SFL}/00400-004FF.el	${DST}/00400-004FF.el	444
+_install N ${SFL}/00500-0052F.el	${DST}/00500-0052F.el	444
+_install N ${SFL}/00530-0058F.el	${DST}/00530-0058F.el	444
+_install N ${SFL}/00590-005FF.el	${DST}/00590-005FF.el	444
+_install N ${SFL}/00600-006FF.el	${DST}/00600-006FF.el	444
+_install N ${SFL}/00700-0074F.el	${DST}/00700-0074F.el	444
+_install N ${SFL}/00780-007BF.el	${DST}/00780-007BF.el	444
+_install N ${SFL}/00900-0097F.el	${DST}/00900-0097F.el	444
+_install N ${SFL}/00980-009FF.el	${DST}/00980-009FF.el	444
+_install N ${SFL}/00A00-00A7F.el	${DST}/00A00-00A7F.el	444
+_install N ${SFL}/00A80-00AFF.el	${DST}/00A80-00AFF.el	444
+_install N ${SFL}/00B00-00B7F.el	${DST}/00B00-00B7F.el	444
+_install N ${SFL}/00B80-00BFF.el	${DST}/00B80-00BFF.el	444
+_install N ${SFL}/00C00-00C7F.el	${DST}/00C00-00C7F.el	444
+_install N ${SFL}/00C80-00CFF.el	${DST}/00C80-00CFF.el	444
+_install N ${SFL}/00D00-00D7F.el	${DST}/00D00-00D7F.el	444
+_install N ${SFL}/00D80-00DFF.el	${DST}/00D80-00DFF.el	444
+_install N ${SFL}/00E00-00E7F.el	${DST}/00E00-00E7F.el	444
+_install N ${SFL}/00E80-00EFF.el	${DST}/00E80-00EFF.el	444
+_install N ${SFL}/00F00-00FFF.el	${DST}/00F00-00FFF.el	444
+_install N ${SFL}/01000-0109F.el	${DST}/01000-0109F.el	444
+_install N ${SFL}/010A0-010FF.el	${DST}/010A0-010FF.el	444
+_install N ${SFL}/01100-011FF.el	${DST}/01100-011FF.el	444
+_install N ${SFL}/01200-0137F.el	${DST}/01200-0137F.el	444
+_install N ${SFL}/013A0-013FF.el	${DST}/013A0-013FF.el	444
+_install N ${SFL}/01400-0167F.el	${DST}/01400-0167F.el	444
+_install N ${SFL}/01680-0169F.el	${DST}/01680-0169F.el	444
+_install N ${SFL}/016A0-016FF.el	${DST}/016A0-016FF.el	444
+_install N ${SFL}/01700-0171F.el	${DST}/01700-0171F.el	444
+_install N ${SFL}/01720-0173F.el	${DST}/01720-0173F.el	444
+_install N ${SFL}/01740-0175F.el	${DST}/01740-0175F.el	444
+_install N ${SFL}/01760-0177F.el	${DST}/01760-0177F.el	444
+_install N ${SFL}/01780-017FF.el	${DST}/01780-017FF.el	444
+_install N ${SFL}/01800-018AF.el	${DST}/01800-018AF.el	444
+_install N ${SFL}/01E00-01EFF.el	${DST}/01E00-01EFF.el	444
+_install N ${SFL}/01F00-01FFF.el	${DST}/01F00-01FFF.el	444
+_install N ${SFL}/02000-0206F.el	${DST}/02000-0206F.el	444
+_install N ${SFL}/02070-0209F.el	${DST}/02070-0209F.el	444
+_install N ${SFL}/020A0-020CF.el	${DST}/020A0-020CF.el	444
+_install N ${SFL}/020D0-020FF.el	${DST}/020D0-020FF.el	444
+_install N ${SFL}/02100-0214F.el	${DST}/02100-0214F.el	444
+_install N ${SFL}/02150-0218F.el	${DST}/02150-0218F.el	444
+_install N ${SFL}/02190-021FF.el	${DST}/02190-021FF.el	444
+_install N ${SFL}/02200-022FF.el	${DST}/02200-022FF.el	444
+_install N ${SFL}/02300-023FF.el	${DST}/02300-023FF.el	444
+_install N ${SFL}/02400-0243F.el	${DST}/02400-0243F.el	444
+_install N ${SFL}/02440-0245F.el	${DST}/02440-0245F.el	444
+_install N ${SFL}/02460-024FF.el	${DST}/02460-024FF.el	444
+_install N ${SFL}/02500-0257F.el	${DST}/02500-0257F.el	444
+_install N ${SFL}/02580-0259F.el	${DST}/02580-0259F.el	444
+_install N ${SFL}/025A0-025FF.el	${DST}/025A0-025FF.el	444
+_install N ${SFL}/02600-026FF.el	${DST}/02600-026FF.el	444
+_install N ${SFL}/02700-027BF.el	${DST}/02700-027BF.el	444
+_install N ${SFL}/027C0-027EF.el	${DST}/027C0-027EF.el	444
+_install N ${SFL}/027F0-027FF.el	${DST}/027F0-027FF.el	444
+_install N ${SFL}/02800-028FF.el	${DST}/02800-028FF.el	444
+_install N ${SFL}/02900-0297F.el	${DST}/02900-0297F.el	444
+_install N ${SFL}/02980-029FF.el	${DST}/02980-029FF.el	444
+_install N ${SFL}/02A00-02AFF.el	${DST}/02A00-02AFF.el	444
+_install N ${SFL}/02E80-02EFF.el	${DST}/02E80-02EFF.el	444
+_install N ${SFL}/02F00-02FDF.el	${DST}/02F00-02FDF.el	444
+_install N ${SFL}/02FF0-02FFF.el	${DST}/02FF0-02FFF.el	444
+_install N ${SFL}/03000-0303F.el	${DST}/03000-0303F.el	444
+_install N ${SFL}/03040-0309F.el	${DST}/03040-0309F.el	444
+_install N ${SFL}/030A0-030FF.el	${DST}/030A0-030FF.el	444
+_install N ${SFL}/03100-0312F.el	${DST}/03100-0312F.el	444
+_install N ${SFL}/03130-0318F.el	${DST}/03130-0318F.el	444
+_install N ${SFL}/03190-0319F.el	${DST}/03190-0319F.el	444
+_install N ${SFL}/031A0-031BF.el	${DST}/031A0-031BF.el	444
+_install N ${SFL}/031F0-031FF.el	${DST}/031F0-031FF.el	444
+_install N ${SFL}/03200-032FF.el	${DST}/03200-032FF.el	444
+_install N ${SFL}/03300-033FF.el	${DST}/03300-033FF.el	444
+_install N ${SFL}/03400-04DBF.el	${DST}/03400-04DBF.el	444
+_install N ${SFL}/0A000-0A48F.el	${DST}/0A000-0A48F.el	444
+_install N ${SFL}/0A490-0A4CF.el	${DST}/0A490-0A4CF.el	444
+_install N ${SFL}/0FB00-0FB4F.el	${DST}/0FB00-0FB4F.el	444
+_install N ${SFL}/0FB50-0FDFF.el	${DST}/0FB50-0FDFF.el	444
+_install N ${SFL}/0FE00-0FE0F.el	${DST}/0FE00-0FE0F.el	444
+_install N ${SFL}/0FE20-0FE2F.el	${DST}/0FE20-0FE2F.el	444
+_install N ${SFL}/0FE30-0FE4F.el	${DST}/0FE30-0FE4F.el	444
+_install N ${SFL}/0FE50-0FE6F.el	${DST}/0FE50-0FE6F.el	444
+_install N ${SFL}/0FE70-0FEFF.el	${DST}/0FE70-0FEFF.el	444
+_install N ${SFL}/0FF00-0FFEF.el	${DST}/0FF00-0FFEF.el	444
+_install N ${SFL}/0FFF0-0FFFF.el	${DST}/0FFF0-0FFFF.el	444
+_install N ${SFL}/10300-1032F.el	${DST}/10300-1032F.el	444
+_install N ${SFL}/10330-1034F.el	${DST}/10330-1034F.el	444
+_install N ${SFL}/10400-1044F.el	${DST}/10400-1044F.el	444
+_install N ${SFL}/1D000-1D0FF.el	${DST}/1D000-1D0FF.el	444
+_install N ${SFL}/1D100-1D1FF.el	${DST}/1D100-1D1FF.el	444
+_install N ${SFL}/1D400-1D7FF.el	${DST}/1D400-1D7FF.el	444
+_install N ${SFL}/E0000-E007F.el	${DST}/E0000-E007F.el	444
 _install N ${SFL}/README	${DST}/README	444
-_install N ${SFL}/close.png	${DST}/close.png	444
-_install N ${SFL}/close.xpm	${DST}/close.xpm	444
-_install N ${SFL}/empty.png	${DST}/empty.png	444
-_install N ${SFL}/empty.xpm	${DST}/empty.xpm	444
-_install N ${SFL}/end-guide.png	${DST}/end-guide.png	444
-_install N ${SFL}/end-guide.xpm	${DST}/end-guide.xpm	444
-_install N ${SFL}/guide.png	${DST}/guide.png	444
-_install N ${SFL}/guide.xpm	${DST}/guide.xpm	444
-_install N ${SFL}/handle.png	${DST}/handle.png	444
-_install N ${SFL}/handle.xpm	${DST}/handle.xpm	444
-_install N ${SFL}/leaf.png	${DST}/leaf.png	444
-_install N ${SFL}/leaf.xpm	${DST}/leaf.xpm	444
-_install N ${SFL}/no-guide.png	${DST}/no-guide.png	444
-_install N ${SFL}/no-guide.xpm	${DST}/no-guide.xpm	444
-_install N ${SFL}/no-handle.png	${DST}/no-handle.png	444
-_install N ${SFL}/no-handle.xpm	${DST}/no-handle.xpm	444
-_install N ${SFL}/open.png	${DST}/open.png	444
-_install N ${SFL}/open.xpm	${DST}/open.xpm	444
+_install N ${SFL}/test-invalid.xml	${DST}/test-invalid.xml	444
+_install N ${SFL}/test-valid.xml	${DST}/test-valid.xml	444
 
 
-SFL="usr/share/emacs/22.1/leim"
-DST="${ROOT}/usr/share/emacs/22.1/leim"
+SFL="usr/share/emacs/23.1/etc/refcards"
+DST="${ROOT}/usr/share/emacs/23.1/etc/refcards"
+_install N ${SFL}/Makefile	${DST}/Makefile	444
+_install N ${SFL}/README	${DST}/README	444
+_install N ${SFL}/calccard.pdf	${DST}/calccard.pdf	444
+_install N ${SFL}/calccard.tex	${DST}/calccard.tex	444
+_install N ${SFL}/cs-dired-ref.pdf	${DST}/cs-dired-ref.pdf	444
+_install N ${SFL}/cs-dired-ref.tex	${DST}/cs-dired-ref.tex	444
+_install N ${SFL}/cs-refcard.pdf	${DST}/cs-refcard.pdf	444
+_install N ${SFL}/cs-refcard.tex	${DST}/cs-refcard.tex	444
+_install N ${SFL}/cs-survival.tex	${DST}/cs-survival.tex	444
+_install N ${SFL}/de-refcard.pdf	${DST}/de-refcard.pdf	444
+_install N ${SFL}/de-refcard.tex	${DST}/de-refcard.tex	444
+_install N ${SFL}/dired-ref.pdf	${DST}/dired-ref.pdf	444
+_install N ${SFL}/dired-ref.tex	${DST}/dired-ref.tex	444
+_install N ${SFL}/fr-dired-ref.pdf	${DST}/fr-dired-ref.pdf	444
+_install N ${SFL}/fr-dired-ref.tex	${DST}/fr-dired-ref.tex	444
+_install N ${SFL}/fr-refcard.pdf	${DST}/fr-refcard.pdf	444
+_install N ${SFL}/fr-refcard.tex	${DST}/fr-refcard.tex	444
+_install N ${SFL}/fr-survival.tex	${DST}/fr-survival.tex	444
+_install N ${SFL}/gnus-booklet.pdf	${DST}/gnus-booklet.pdf	444
+_install N ${SFL}/gnus-logo.eps	${DST}/gnus-logo.eps	444
+_install N ${SFL}/gnus-logo.pdf	${DST}/gnus-logo.pdf	444
+_install N ${SFL}/gnus-refcard.pdf	${DST}/gnus-refcard.pdf	444
+_install N ${SFL}/gnus-refcard.tex	${DST}/gnus-refcard.tex	444
+_install N ${SFL}/orgcard.pdf	${DST}/orgcard.pdf	444
+_install N ${SFL}/orgcard.tex	${DST}/orgcard.tex	444
+_install N ${SFL}/pdflayout.sty	${DST}/pdflayout.sty	444
+_install N ${SFL}/pl-refcard.pdf	${DST}/pl-refcard.pdf	444
+_install N ${SFL}/pl-refcard.tex	${DST}/pl-refcard.tex	444
+_install N ${SFL}/pt-br-refcard.pdf	${DST}/pt-br-refcard.pdf	444
+_install N ${SFL}/pt-br-refcard.tex	${DST}/pt-br-refcard.tex	444
+_install N ${SFL}/refcard.pdf	${DST}/refcard.pdf	444
+_install N ${SFL}/refcard.tex	${DST}/refcard.tex	444
+_install N ${SFL}/ru-refcard.pdf	${DST}/ru-refcard.pdf	444
+_install N ${SFL}/ru-refcard.tex	${DST}/ru-refcard.tex	444
+_install N ${SFL}/sk-dired-ref.pdf	${DST}/sk-dired-ref.pdf	444
+_install N ${SFL}/sk-dired-ref.tex	${DST}/sk-dired-ref.tex	444
+_install N ${SFL}/sk-refcard.pdf	${DST}/sk-refcard.pdf	444
+_install N ${SFL}/sk-refcard.tex	${DST}/sk-refcard.tex	444
+_install N ${SFL}/sk-survival.tex	${DST}/sk-survival.tex	444
+_install N ${SFL}/survival.tex	${DST}/survival.tex	444
+_install N ${SFL}/vipcard.tex	${DST}/vipcard.tex	444
+_install N ${SFL}/viperCard.tex	${DST}/viperCard.tex	444
+
+
+SFL="usr/share/emacs/23.1/etc/schema"
+DST="${ROOT}/usr/share/emacs/23.1/etc/schema"
+_install N ${SFL}/README	${DST}/README	444
+_install N ${SFL}/calstbl.rnc	${DST}/calstbl.rnc	444
+_install N ${SFL}/dbcalstbl.rnc	${DST}/dbcalstbl.rnc	444
+_install N ${SFL}/dbhier.rnc	${DST}/dbhier.rnc	444
+_install N ${SFL}/dbnotn.rnc	${DST}/dbnotn.rnc	444
+_install N ${SFL}/dbpool.rnc	${DST}/dbpool.rnc	444
+_install N ${SFL}/dbstart.rnc	${DST}/dbstart.rnc	444
+_install N ${SFL}/docbook.rnc	${DST}/docbook.rnc	444
+_install N ${SFL}/locate.rnc	${DST}/locate.rnc	444
+_install N ${SFL}/rdfxml.rnc	${DST}/rdfxml.rnc	444
+_install N ${SFL}/relaxng.rnc	${DST}/relaxng.rnc	444
+_install N ${SFL}/schemas.xml	${DST}/schemas.xml	444
+_install N ${SFL}/xhtml-applet.rnc	${DST}/xhtml-applet.rnc	444
+_install N ${SFL}/xhtml-attribs.rnc	${DST}/xhtml-attribs.rnc	444
+_install N ${SFL}/xhtml-base.rnc	${DST}/xhtml-base.rnc	444
+_install N ${SFL}/xhtml-bdo.rnc	${DST}/xhtml-bdo.rnc	444
+_install N ${SFL}/xhtml-bform.rnc	${DST}/xhtml-bform.rnc	444
+_install N ${SFL}/xhtml-btable.rnc	${DST}/xhtml-btable.rnc	444
+_install N ${SFL}/xhtml-csismap.rnc	${DST}/xhtml-csismap.rnc	444
+_install N ${SFL}/xhtml-datatypes.rnc	${DST}/xhtml-datatypes.rnc	444
+_install N ${SFL}/xhtml-edit.rnc	${DST}/xhtml-edit.rnc	444
+_install N ${SFL}/xhtml-events.rnc	${DST}/xhtml-events.rnc	444
+_install N ${SFL}/xhtml-form.rnc	${DST}/xhtml-form.rnc	444
+_install N ${SFL}/xhtml-frames.rnc	${DST}/xhtml-frames.rnc	444
+_install N ${SFL}/xhtml-hypertext.rnc	${DST}/xhtml-hypertext.rnc	444
+_install N ${SFL}/xhtml-iframe.rnc	${DST}/xhtml-iframe.rnc	444
+_install N ${SFL}/xhtml-image.rnc	${DST}/xhtml-image.rnc	444
+_install N ${SFL}/xhtml-inlstyle.rnc	${DST}/xhtml-inlstyle.rnc	444
+_install N ${SFL}/xhtml-legacy.rnc	${DST}/xhtml-legacy.rnc	444
+_install N ${SFL}/xhtml-link.rnc	${DST}/xhtml-link.rnc	444
+_install N ${SFL}/xhtml-lst.rnc	${DST}/xhtml-lst.rnc	444
+_install N ${SFL}/xhtml-meta.rnc	${DST}/xhtml-meta.rnc	444
+_install N ${SFL}/xhtml-nameident.rnc	${DST}/xhtml-nameident.rnc	444
+_install N ${SFL}/xhtml-object.rnc	${DST}/xhtml-object.rnc	444
+_install N ${SFL}/xhtml-param.rnc	${DST}/xhtml-param.rnc	444
+_install N ${SFL}/xhtml-pres.rnc	${DST}/xhtml-pres.rnc	444
+_install N ${SFL}/xhtml-ruby.rnc	${DST}/xhtml-ruby.rnc	444
+_install N ${SFL}/xhtml-script.rnc	${DST}/xhtml-script.rnc	444
+_install N ${SFL}/xhtml-ssismap.rnc	${DST}/xhtml-ssismap.rnc	444
+_install N ${SFL}/xhtml-struct.rnc	${DST}/xhtml-struct.rnc	444
+_install N ${SFL}/xhtml-table.rnc	${DST}/xhtml-table.rnc	444
+_install N ${SFL}/xhtml-text.rnc	${DST}/xhtml-text.rnc	444
+_install N ${SFL}/xhtml-tgt.rnc	${DST}/xhtml-tgt.rnc	444
+_install N ${SFL}/xhtml-xstyle.rnc	${DST}/xhtml-xstyle.rnc	444
+_install N ${SFL}/xhtml.rnc	${DST}/xhtml.rnc	444
+_install N ${SFL}/xslt.rnc	${DST}/xslt.rnc	444
+
+
+SFL="usr/share/emacs/23.1/etc/tutorials"
+DST="${ROOT}/usr/share/emacs/23.1/etc/tutorials"
+_install N ${SFL}/TUTORIAL	${DST}/TUTORIAL	444
+_install N ${SFL}/TUTORIAL.bg	${DST}/TUTORIAL.bg	444
+_install N ${SFL}/TUTORIAL.cn	${DST}/TUTORIAL.cn	444
+_install N ${SFL}/TUTORIAL.cs	${DST}/TUTORIAL.cs	444
+_install N ${SFL}/TUTORIAL.de	${DST}/TUTORIAL.de	444
+_install N ${SFL}/TUTORIAL.eo	${DST}/TUTORIAL.eo	444
+_install N ${SFL}/TUTORIAL.es	${DST}/TUTORIAL.es	444
+_install N ${SFL}/TUTORIAL.fr	${DST}/TUTORIAL.fr	444
+_install N ${SFL}/TUTORIAL.it	${DST}/TUTORIAL.it	444
+_install N ${SFL}/TUTORIAL.ja	${DST}/TUTORIAL.ja	444
+_install N ${SFL}/TUTORIAL.ko	${DST}/TUTORIAL.ko	444
+_install N ${SFL}/TUTORIAL.nl	${DST}/TUTORIAL.nl	444
+_install N ${SFL}/TUTORIAL.pl	${DST}/TUTORIAL.pl	444
+_install N ${SFL}/TUTORIAL.pt_BR	${DST}/TUTORIAL.pt_BR	444
+_install N ${SFL}/TUTORIAL.ro	${DST}/TUTORIAL.ro	444
+_install N ${SFL}/TUTORIAL.ru	${DST}/TUTORIAL.ru	444
+_install N ${SFL}/TUTORIAL.sk	${DST}/TUTORIAL.sk	444
+_install N ${SFL}/TUTORIAL.sl	${DST}/TUTORIAL.sl	444
+_install N ${SFL}/TUTORIAL.sv	${DST}/TUTORIAL.sv	444
+_install N ${SFL}/TUTORIAL.th	${DST}/TUTORIAL.th	444
+_install N ${SFL}/TUTORIAL.translators	${DST}/TUTORIAL.translators	444
+_install N ${SFL}/TUTORIAL.zh	${DST}/TUTORIAL.zh	444
+
+
+SFL="usr/share/emacs/23.1/leim"
+DST="${ROOT}/usr/share/emacs/23.1/leim"
 _install N ${SFL}/leim-list.el	${DST}/leim-list.el	444
 
 
-SFL="usr/share/emacs/22.1/leim/ja-dic"
-DST="${ROOT}/usr/share/emacs/22.1/leim/ja-dic"
+SFL="usr/share/emacs/23.1/leim/ja-dic"
+DST="${ROOT}/usr/share/emacs/23.1/leim/ja-dic"
 _install N ${SFL}/ja-dic.el.gz	${DST}/ja-dic.el.gz	444
 _install N ${SFL}/ja-dic.elc	${DST}/ja-dic.elc	444
 
 
-SFL="usr/share/emacs/22.1/leim/quail"
-DST="${ROOT}/usr/share/emacs/22.1/leim/quail"
+SFL="usr/share/emacs/23.1/leim/quail"
+DST="${ROOT}/usr/share/emacs/23.1/leim/quail"
 _install N ${SFL}/4Corner.el.gz	${DST}/4Corner.el.gz	444
 _install N ${SFL}/4Corner.elc	${DST}/4Corner.elc	444
 _install N ${SFL}/ARRAY30.el.gz	${DST}/ARRAY30.el.gz	444
@@ -699,6 +1083,8 @@
 _install N ${SFL}/ZIRANMA.elc	${DST}/ZIRANMA.elc	444
 _install N ${SFL}/ZOZY.el.gz	${DST}/ZOZY.el.gz	444
 _install N ${SFL}/ZOZY.elc	${DST}/ZOZY.elc	444
+_install N ${SFL}/arabic.el.gz	${DST}/arabic.el.gz	444
+_install N ${SFL}/arabic.elc	${DST}/arabic.elc	444
 _install N ${SFL}/croatian.el.gz	${DST}/croatian.el.gz	444
 _install N ${SFL}/croatian.elc	${DST}/croatian.elc	444
 _install N ${SFL}/cyril-jis.el.gz	${DST}/cyril-jis.el.gz	444
@@ -715,8 +1101,6 @@
 _install N ${SFL}/greek.elc	${DST}/greek.elc	444
 _install N ${SFL}/hangul.el.gz	${DST}/hangul.el.gz	444
 _install N ${SFL}/hangul.elc	${DST}/hangul.elc	444
-_install N ${SFL}/hangul3.el.gz	${DST}/hangul3.el.gz	444
-_install N ${SFL}/hangul3.elc	${DST}/hangul3.elc	444
 _install N ${SFL}/hanja-jis.el.gz	${DST}/hanja-jis.el.gz	444
 _install N ${SFL}/hanja-jis.elc	${DST}/hanja-jis.elc	444
 _install N ${SFL}/hanja.el.gz	${DST}/hanja.el.gz	444
@@ -779,8 +1163,8 @@
 _install N ${SFL}/welsh.elc	${DST}/welsh.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp"
-DST="${ROOT}/usr/share/emacs/22.1/lisp"
+SFL="usr/share/emacs/23.1/lisp"
+DST="${ROOT}/usr/share/emacs/23.1/lisp"
 _install N ${SFL}/COPYING	${DST}/COPYING	444
 _install N ${SFL}/README	${DST}/README	444
 _install N ${SFL}/abbrev.el.gz	${DST}/abbrev.el.gz	444
@@ -884,6 +1268,8 @@
 _install N ${SFL}/disp-table.elc	${DST}/disp-table.elc	444
 _install N ${SFL}/dnd.el.gz	${DST}/dnd.el.gz	444
 _install N ${SFL}/dnd.elc	${DST}/dnd.elc	444
+_install N ${SFL}/doc-view.el.gz	${DST}/doc-view.el.gz	444
+_install N ${SFL}/doc-view.elc	${DST}/doc-view.elc	444
 _install N ${SFL}/dos-fns.el.gz	${DST}/dos-fns.el.gz	444
 _install N ${SFL}/dos-fns.elc	${DST}/dos-fns.elc	444
 _install N ${SFL}/dos-vars.el.gz	${DST}/dos-vars.el.gz	444
@@ -932,10 +1318,26 @@
 _install N ${SFL}/emerge.elc	${DST}/emerge.elc	444
 _install N ${SFL}/env.el.gz	${DST}/env.el.gz	444
 _install N ${SFL}/env.elc	${DST}/env.elc	444
+_install N ${SFL}/epa-dired.el.gz	${DST}/epa-dired.el.gz	444
+_install N ${SFL}/epa-dired.elc	${DST}/epa-dired.elc	444
+_install N ${SFL}/epa-file.el.gz	${DST}/epa-file.el.gz	444
+_install N ${SFL}/epa-file.elc	${DST}/epa-file.elc	444
+_install N ${SFL}/epa-hook.el.gz	${DST}/epa-hook.el.gz	444
+_install N ${SFL}/epa-hook.elc	${DST}/epa-hook.elc	444
+_install N ${SFL}/epa-mail.el.gz	${DST}/epa-mail.el.gz	444
+_install N ${SFL}/epa-mail.elc	${DST}/epa-mail.elc	444
+_install N ${SFL}/epa.el.gz	${DST}/epa.el.gz	444
+_install N ${SFL}/epa.elc	${DST}/epa.elc	444
+_install N ${SFL}/epg-config.el.gz	${DST}/epg-config.el.gz	444
+_install N ${SFL}/epg-config.elc	${DST}/epg-config.elc	444
+_install N ${SFL}/epg.el.gz	${DST}/epg.el.gz	444
+_install N ${SFL}/epg.elc	${DST}/epg.elc	444
 _install N ${SFL}/expand.el.gz	${DST}/expand.el.gz	444
 _install N ${SFL}/expand.elc	${DST}/expand.elc	444
 _install N ${SFL}/ezimage.el.gz	${DST}/ezimage.el.gz	444
 _install N ${SFL}/ezimage.elc	${DST}/ezimage.elc	444
+_install N ${SFL}/face-remap.el.gz	${DST}/face-remap.el.gz	444
+_install N ${SFL}/face-remap.elc	${DST}/face-remap.elc	444
 _install N ${SFL}/facemenu.el.gz	${DST}/facemenu.el.gz	444
 _install N ${SFL}/facemenu.elc	${DST}/facemenu.elc	444
 _install N ${SFL}/faces.el.gz	${DST}/faces.el.gz	444
@@ -948,6 +1350,8 @@
 _install N ${SFL}/files.elc	${DST}/files.elc	444
 _install N ${SFL}/filesets.el.gz	${DST}/filesets.el.gz	444
 _install N ${SFL}/filesets.elc	${DST}/filesets.elc	444
+_install N ${SFL}/find-cmd.el.gz	${DST}/find-cmd.el.gz	444
+_install N ${SFL}/find-cmd.elc	${DST}/find-cmd.elc	444
 _install N ${SFL}/find-dired.el.gz	${DST}/find-dired.el.gz	444
 _install N ${SFL}/find-dired.elc	${DST}/find-dired.elc	444
 _install N ${SFL}/find-file.el.gz	${DST}/find-file.el.gz	444
@@ -967,9 +1371,10 @@
 _install N ${SFL}/font-core.elc	${DST}/font-core.elc	444
 _install N ${SFL}/font-lock.el.gz	${DST}/font-lock.el.gz	444
 _install N ${SFL}/font-lock.elc	${DST}/font-lock.elc	444
+_install N ${SFL}/format-spec.el.gz	${DST}/format-spec.el.gz	444
+_install N ${SFL}/format-spec.elc	${DST}/format-spec.elc	444
 _install N ${SFL}/format.el.gz	${DST}/format.el.gz	444
 _install N ${SFL}/format.elc	${DST}/format.elc	444
-_install N ${SFL}/forms-d2.dat	${DST}/forms-d2.dat	444
 _install N ${SFL}/forms-d2.el	${DST}/forms-d2.el	444
 _install N ${SFL}/forms-pass.el	${DST}/forms-pass.el	444
 _install N ${SFL}/forms.el.gz	${DST}/forms.el.gz	444
@@ -992,6 +1397,8 @@
 _install N ${SFL}/help-mode.elc	${DST}/help-mode.elc	444
 _install N ${SFL}/help.el.gz	${DST}/help.el.gz	444
 _install N ${SFL}/help.elc	${DST}/help.elc	444
+_install N ${SFL}/hex-util.el.gz	${DST}/hex-util.el.gz	444
+_install N ${SFL}/hex-util.elc	${DST}/hex-util.elc	444
 _install N ${SFL}/hexl.el.gz	${DST}/hexl.el.gz	444
 _install N ${SFL}/hexl.elc	${DST}/hexl.elc	444
 _install N ${SFL}/hi-lock.el.gz	${DST}/hi-lock.el.gz	444
@@ -1048,6 +1455,8 @@
 _install N ${SFL}/jka-cmpr-hook.elc	${DST}/jka-cmpr-hook.elc	444
 _install N ${SFL}/jka-compr.el.gz	${DST}/jka-compr.el.gz	444
 _install N ${SFL}/jka-compr.elc	${DST}/jka-compr.elc	444
+_install N ${SFL}/json.el.gz	${DST}/json.el.gz	444
+_install N ${SFL}/json.elc	${DST}/json.elc	444
 _install N ${SFL}/kermit.el.gz	${DST}/kermit.el.gz	444
 _install N ${SFL}/kermit.elc	${DST}/kermit.elc	444
 _install N ${SFL}/kmacro.el.gz	${DST}/kmacro.el.gz	444
@@ -1055,6 +1464,8 @@
 _install N ${SFL}/ldefs-boot.el	${DST}/ldefs-boot.el	444
 _install N ${SFL}/ledit.el.gz	${DST}/ledit.el.gz	444
 _install N ${SFL}/ledit.elc	${DST}/ledit.elc	444
+_install N ${SFL}/linum.el.gz	${DST}/linum.el.gz	444
+_install N ${SFL}/linum.elc	${DST}/linum.elc	444
 _install N ${SFL}/loaddefs.el	${DST}/loaddefs.el	444
 _install N ${SFL}/loadhist.el.gz	${DST}/loadhist.el.gz	444
 _install N ${SFL}/loadhist.elc	${DST}/loadhist.elc	444
@@ -1079,14 +1490,22 @@
 _install N ${SFL}/man.elc	${DST}/man.elc	444
 _install N ${SFL}/master.el.gz	${DST}/master.el.gz	444
 _install N ${SFL}/master.elc	${DST}/master.elc	444
+_install N ${SFL}/mb-depth.el.gz	${DST}/mb-depth.el.gz	444
+_install N ${SFL}/mb-depth.elc	${DST}/mb-depth.elc	444
+_install N ${SFL}/md4.el.gz	${DST}/md4.el.gz	444
+_install N ${SFL}/md4.elc	${DST}/md4.elc	444
 _install N ${SFL}/menu-bar.el.gz	${DST}/menu-bar.el.gz	444
 _install N ${SFL}/menu-bar.elc	${DST}/menu-bar.elc	444
 _install N ${SFL}/midnight.el.gz	${DST}/midnight.el.gz	444
 _install N ${SFL}/midnight.elc	${DST}/midnight.elc	444
 _install N ${SFL}/minibuf-eldef.el.gz	${DST}/minibuf-eldef.el.gz	444
 _install N ${SFL}/minibuf-eldef.elc	${DST}/minibuf-eldef.elc	444
+_install N ${SFL}/minibuffer.el.gz	${DST}/minibuffer.el.gz	444
+_install N ${SFL}/minibuffer.elc	${DST}/minibuffer.elc	444
 _install N ${SFL}/misc.el.gz	${DST}/misc.el.gz	444
 _install N ${SFL}/misc.elc	${DST}/misc.elc	444
+_install N ${SFL}/misearch.el.gz	${DST}/misearch.el.gz	444
+_install N ${SFL}/misearch.elc	${DST}/misearch.elc	444
 _install N ${SFL}/mouse-copy.el.gz	${DST}/mouse-copy.el.gz	444
 _install N ${SFL}/mouse-copy.elc	${DST}/mouse-copy.elc	444
 _install N ${SFL}/mouse-drag.el.gz	${DST}/mouse-drag.el.gz	444
@@ -1107,6 +1526,8 @@
 _install N ${SFL}/outline.elc	${DST}/outline.elc	444
 _install N ${SFL}/paren.el.gz	${DST}/paren.el.gz	444
 _install N ${SFL}/paren.elc	${DST}/paren.elc	444
+_install N ${SFL}/password-cache.el.gz	${DST}/password-cache.el.gz	444
+_install N ${SFL}/password-cache.elc	${DST}/password-cache.elc	444
 _install N ${SFL}/patcomp.el	${DST}/patcomp.el	444
 _install N ${SFL}/paths.el	${DST}/paths.el	444
 _install N ${SFL}/pcmpl-cvs.el.gz	${DST}/pcmpl-cvs.el.gz	444
@@ -1145,12 +1566,18 @@
 _install N ${SFL}/pgg.elc	${DST}/pgg.elc	444
 _install N ${SFL}/printing.el.gz	${DST}/printing.el.gz	444
 _install N ${SFL}/printing.elc	${DST}/printing.elc	444
+_install N ${SFL}/proced.el.gz	${DST}/proced.el.gz	444
+_install N ${SFL}/proced.elc	${DST}/proced.elc	444
 _install N ${SFL}/ps-bdf.el.gz	${DST}/ps-bdf.el.gz	444
 _install N ${SFL}/ps-bdf.elc	${DST}/ps-bdf.elc	444
+_install N ${SFL}/ps-def.el.gz	${DST}/ps-def.el.gz	444
+_install N ${SFL}/ps-def.elc	${DST}/ps-def.elc	444
 _install N ${SFL}/ps-mule.el.gz	${DST}/ps-mule.el.gz	444
 _install N ${SFL}/ps-mule.elc	${DST}/ps-mule.elc	444
 _install N ${SFL}/ps-print.el.gz	${DST}/ps-print.el.gz	444
 _install N ${SFL}/ps-print.elc	${DST}/ps-print.elc	444
+_install N ${SFL}/ps-samp.el.gz	${DST}/ps-samp.el.gz	444
+_install N ${SFL}/ps-samp.elc	${DST}/ps-samp.elc	444
 _install N ${SFL}/recentf.el.gz	${DST}/recentf.el.gz	444
 _install N ${SFL}/recentf.elc	${DST}/recentf.elc	444
 _install N ${SFL}/rect.el.gz	${DST}/rect.el.gz	444
@@ -1163,8 +1590,6 @@
 _install N ${SFL}/replace.elc	${DST}/replace.elc	444
 _install N ${SFL}/reposition.el.gz	${DST}/reposition.el.gz	444
 _install N ${SFL}/reposition.elc	${DST}/reposition.elc	444
-_install N ${SFL}/resume.el.gz	${DST}/resume.el.gz	444
-_install N ${SFL}/resume.elc	${DST}/resume.elc	444
 _install N ${SFL}/reveal.el.gz	${DST}/reveal.el.gz	444
 _install N ${SFL}/reveal.elc	${DST}/reveal.elc	444
 _install N ${SFL}/rfn-eshadow.el.gz	${DST}/rfn-eshadow.el.gz	444
@@ -1193,6 +1618,8 @@
 _install N ${SFL}/server.elc	${DST}/server.elc	444
 _install N ${SFL}/ses.el.gz	${DST}/ses.el.gz	444
 _install N ${SFL}/ses.elc	${DST}/ses.elc	444
+_install N ${SFL}/sha1.el.gz	${DST}/sha1.el.gz	444
+_install N ${SFL}/sha1.elc	${DST}/sha1.elc	444
 _install N ${SFL}/shadowfile.el.gz	${DST}/shadowfile.el.gz	444
 _install N ${SFL}/shadowfile.elc	${DST}/shadowfile.elc	444
 _install N ${SFL}/shell.el.gz	${DST}/shell.el.gz	444
@@ -1256,14 +1683,28 @@
 _install N ${SFL}/uniquify.elc	${DST}/uniquify.elc	444
 _install N ${SFL}/userlock.el.gz	${DST}/userlock.el.gz	444
 _install N ${SFL}/userlock.elc	${DST}/userlock.elc	444
+_install N ${SFL}/vc-annotate.el.gz	${DST}/vc-annotate.el.gz	444
+_install N ${SFL}/vc-annotate.elc	${DST}/vc-annotate.elc	444
 _install N ${SFL}/vc-arch.el.gz	${DST}/vc-arch.el.gz	444
 _install N ${SFL}/vc-arch.elc	${DST}/vc-arch.elc	444
+_install N ${SFL}/vc-bzr.el.gz	${DST}/vc-bzr.el.gz	444
+_install N ${SFL}/vc-bzr.elc	${DST}/vc-bzr.elc	444
 _install N ${SFL}/vc-cvs.el.gz	${DST}/vc-cvs.el.gz	444
 _install N ${SFL}/vc-cvs.elc	${DST}/vc-cvs.elc	444
+_install N ${SFL}/vc-dav.el.gz	${DST}/vc-dav.el.gz	444
+_install N ${SFL}/vc-dav.elc	${DST}/vc-dav.elc	444
+_install N ${SFL}/vc-dir.el.gz	${DST}/vc-dir.el.gz	444
+_install N ${SFL}/vc-dir.elc	${DST}/vc-dir.elc	444
+_install N ${SFL}/vc-dispatcher.el.gz	${DST}/vc-dispatcher.el.gz	444
+_install N ${SFL}/vc-dispatcher.elc	${DST}/vc-dispatcher.elc	444
+_install N ${SFL}/vc-git.el.gz	${DST}/vc-git.el.gz	444
+_install N ${SFL}/vc-git.elc	${DST}/vc-git.elc	444
+_install N ${SFL}/vc-hg.el.gz	${DST}/vc-hg.el.gz	444
+_install N ${SFL}/vc-hg.elc	${DST}/vc-hg.elc	444
 _install N ${SFL}/vc-hooks.el.gz	${DST}/vc-hooks.el.gz	444
 _install N ${SFL}/vc-hooks.elc	${DST}/vc-hooks.elc	444
-_install N ${SFL}/vc-mcvs.el.gz	${DST}/vc-mcvs.el.gz	444
-_install N ${SFL}/vc-mcvs.elc	${DST}/vc-mcvs.elc	444
+_install N ${SFL}/vc-mtn.el.gz	${DST}/vc-mtn.el.gz	444
+_install N ${SFL}/vc-mtn.elc	${DST}/vc-mtn.elc	444
 _install N ${SFL}/vc-rcs.el.gz	${DST}/vc-rcs.el.gz	444
 _install N ${SFL}/vc-rcs.elc	${DST}/vc-rcs.elc	444
 _install N ${SFL}/vc-sccs.el.gz	${DST}/vc-sccs.el.gz	444
@@ -1277,10 +1718,6 @@
 _install N ${SFL}/version.el	${DST}/version.el	444
 _install N ${SFL}/view.el.gz	${DST}/view.el.gz	444
 _install N ${SFL}/view.elc	${DST}/view.elc	444
-_install N ${SFL}/vms-patch.el.gz	${DST}/vms-patch.el.gz	444
-_install N ${SFL}/vms-patch.elc	${DST}/vms-patch.elc	444
-_install N ${SFL}/vmsproc.el.gz	${DST}/vmsproc.el.gz	444
-_install N ${SFL}/vmsproc.elc	${DST}/vmsproc.elc	444
 _install N ${SFL}/vt-control.el.gz	${DST}/vt-control.el.gz	444
 _install N ${SFL}/vt-control.elc	${DST}/vt-control.elc	444
 _install N ${SFL}/vt100-led.el.gz	${DST}/vt100-led.el.gz	444
@@ -1315,9 +1752,10 @@
 _install N ${SFL}/xt-mouse.elc	${DST}/xt-mouse.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/calc"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/calc"
+SFL="usr/share/emacs/23.1/lisp/calc"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/calc"
 _install N ${SFL}/README	${DST}/README	444
+_install N ${SFL}/README.prev	${DST}/README.prev	444
 _install N ${SFL}/calc-aent.el.gz	${DST}/calc-aent.el.gz	444
 _install N ${SFL}/calc-aent.elc	${DST}/calc-aent.elc	444
 _install N ${SFL}/calc-alg.el.gz	${DST}/calc-alg.el.gz	444
@@ -1352,18 +1790,23 @@
 _install N ${SFL}/calc-keypd.elc	${DST}/calc-keypd.elc	444
 _install N ${SFL}/calc-lang.el.gz	${DST}/calc-lang.el.gz	444
 _install N ${SFL}/calc-lang.elc	${DST}/calc-lang.elc	444
+_install N ${SFL}/calc-loaddefs.el	${DST}/calc-loaddefs.el	444
 _install N ${SFL}/calc-macs.el.gz	${DST}/calc-macs.el.gz	444
 _install N ${SFL}/calc-macs.elc	${DST}/calc-macs.elc	444
 _install N ${SFL}/calc-map.el.gz	${DST}/calc-map.el.gz	444
 _install N ${SFL}/calc-map.elc	${DST}/calc-map.elc	444
 _install N ${SFL}/calc-math.el.gz	${DST}/calc-math.el.gz	444
 _install N ${SFL}/calc-math.elc	${DST}/calc-math.elc	444
+_install N ${SFL}/calc-menu.el.gz	${DST}/calc-menu.el.gz	444
+_install N ${SFL}/calc-menu.elc	${DST}/calc-menu.elc	444
 _install N ${SFL}/calc-misc.el.gz	${DST}/calc-misc.el.gz	444
 _install N ${SFL}/calc-misc.elc	${DST}/calc-misc.elc	444
 _install N ${SFL}/calc-mode.el.gz	${DST}/calc-mode.el.gz	444
 _install N ${SFL}/calc-mode.elc	${DST}/calc-mode.elc	444
 _install N ${SFL}/calc-mtx.el.gz	${DST}/calc-mtx.el.gz	444
 _install N ${SFL}/calc-mtx.elc	${DST}/calc-mtx.elc	444
+_install N ${SFL}/calc-nlfit.el.gz	${DST}/calc-nlfit.el.gz	444
+_install N ${SFL}/calc-nlfit.elc	${DST}/calc-nlfit.elc	444
 _install N ${SFL}/calc-poly.el.gz	${DST}/calc-poly.el.gz	444
 _install N ${SFL}/calc-poly.elc	${DST}/calc-poly.elc	444
 _install N ${SFL}/calc-prog.el.gz	${DST}/calc-prog.el.gz	444
@@ -1402,8 +1845,8 @@
 _install N ${SFL}/calcsel2.elc	${DST}/calcsel2.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/calendar"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/calendar"
+SFL="usr/share/emacs/23.1/lisp/calendar"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/calendar"
 _install N ${SFL}/appt.el.gz	${DST}/appt.el.gz	444
 _install N ${SFL}/appt.elc	${DST}/appt.elc	444
 _install N ${SFL}/cal-bahai.el.gz	${DST}/cal-bahai.el.gz	444
@@ -1426,6 +1869,7 @@
 _install N ${SFL}/cal-iso.elc	${DST}/cal-iso.elc	444
 _install N ${SFL}/cal-julian.el.gz	${DST}/cal-julian.el.gz	444
 _install N ${SFL}/cal-julian.elc	${DST}/cal-julian.elc	444
+_install N ${SFL}/cal-loaddefs.el	${DST}/cal-loaddefs.el	444
 _install N ${SFL}/cal-mayan.el.gz	${DST}/cal-mayan.el.gz	444
 _install N ${SFL}/cal-mayan.elc	${DST}/cal-mayan.elc	444
 _install N ${SFL}/cal-menu.el.gz	${DST}/cal-menu.el.gz	444
@@ -1442,6 +1886,8 @@
 _install N ${SFL}/calendar.elc	${DST}/calendar.elc	444
 _install N ${SFL}/diary-lib.el.gz	${DST}/diary-lib.el.gz	444
 _install N ${SFL}/diary-lib.elc	${DST}/diary-lib.elc	444
+_install N ${SFL}/diary-loaddefs.el	${DST}/diary-loaddefs.el	444
+_install N ${SFL}/hol-loaddefs.el	${DST}/hol-loaddefs.el	444
 _install N ${SFL}/holidays.el.gz	${DST}/holidays.el.gz	444
 _install N ${SFL}/holidays.elc	${DST}/holidays.elc	444
 _install N ${SFL}/icalendar.el.gz	${DST}/icalendar.el.gz	444
@@ -1460,8 +1906,8 @@
 _install N ${SFL}/todo-mode.elc	${DST}/todo-mode.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/emacs-lisp"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/emacs-lisp"
+SFL="usr/share/emacs/23.1/lisp/emacs-lisp"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/emacs-lisp"
 _install N ${SFL}/advice.el.gz	${DST}/advice.el.gz	444
 _install N ${SFL}/advice.elc	${DST}/advice.elc	444
 _install N ${SFL}/assoc.el.gz	${DST}/assoc.el.gz	444
@@ -1470,6 +1916,8 @@
 _install N ${SFL}/authors.elc	${DST}/authors.elc	444
 _install N ${SFL}/autoload.el.gz	${DST}/autoload.el.gz	444
 _install N ${SFL}/autoload.elc	${DST}/autoload.elc	444
+_install N ${SFL}/avl-tree.el.gz	${DST}/avl-tree.el.gz	444
+_install N ${SFL}/avl-tree.elc	${DST}/avl-tree.elc	444
 _install N ${SFL}/backquote.el.gz	${DST}/backquote.el.gz	444
 _install N ${SFL}/backquote.elc	${DST}/backquote.elc	444
 _install N ${SFL}/benchmark.el.gz	${DST}/benchmark.el.gz	444
@@ -1482,6 +1930,8 @@
 _install N ${SFL}/byte-run.elc	${DST}/byte-run.elc	444
 _install N ${SFL}/bytecomp.el.gz	${DST}/bytecomp.el.gz	444
 _install N ${SFL}/bytecomp.elc	${DST}/bytecomp.elc	444
+_install N ${SFL}/check-declare.el.gz	${DST}/check-declare.el.gz	444
+_install N ${SFL}/check-declare.elc	${DST}/check-declare.elc	444
 _install N ${SFL}/checkdoc.el.gz	${DST}/checkdoc.el.gz	444
 _install N ${SFL}/checkdoc.elc	${DST}/checkdoc.elc	444
 _install N ${SFL}/cl-compat.el.gz	${DST}/cl-compat.el.gz	444
@@ -1490,6 +1940,7 @@
 _install N ${SFL}/cl-extra.elc	${DST}/cl-extra.elc	444
 _install N ${SFL}/cl-indent.el.gz	${DST}/cl-indent.el.gz	444
 _install N ${SFL}/cl-indent.elc	${DST}/cl-indent.elc	444
+_install N ${SFL}/cl-loaddefs.el	${DST}/cl-loaddefs.el	444
 _install N ${SFL}/cl-macs.el.gz	${DST}/cl-macs.el.gz	444
 _install N ${SFL}/cl-macs.elc	${DST}/cl-macs.elc	444
 _install N ${SFL}/cl-seq.el.gz	${DST}/cl-seq.el.gz	444
@@ -1545,8 +1996,6 @@
 _install N ${SFL}/lisp.elc	${DST}/lisp.elc	444
 _install N ${SFL}/lmenu.el.gz	${DST}/lmenu.el.gz	444
 _install N ${SFL}/lmenu.elc	${DST}/lmenu.elc	444
-_install N ${SFL}/lselect.el.gz	${DST}/lselect.el.gz	444
-_install N ${SFL}/lselect.elc	${DST}/lselect.elc	444
 _install N ${SFL}/lucid.el.gz	${DST}/lucid.el.gz	444
 _install N ${SFL}/lucid.elc	${DST}/lucid.elc	444
 _install N ${SFL}/macroexp.el.gz	${DST}/macroexp.el.gz	444
@@ -1589,8 +2038,8 @@
 _install N ${SFL}/warnings.elc	${DST}/warnings.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/emulation"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/emulation"
+SFL="usr/share/emacs/23.1/lisp/emulation"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/emulation"
 _install N ${SFL}/crisp.el.gz	${DST}/crisp.el.gz	444
 _install N ${SFL}/crisp.elc	${DST}/crisp.elc	444
 _install N ${SFL}/cua-base.el.gz	${DST}/cua-base.el.gz	444
@@ -1645,8 +2094,8 @@
 _install N ${SFL}/ws-mode.elc	${DST}/ws-mode.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/erc"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/erc"
+SFL="usr/share/emacs/23.1/lisp/erc"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/erc"
 _install N ${SFL}/erc-autoaway.el.gz	${DST}/erc-autoaway.el.gz	444
 _install N ${SFL}/erc-autoaway.elc	${DST}/erc-autoaway.elc	444
 _install N ${SFL}/erc-backend.el.gz	${DST}/erc-backend.el.gz	444
@@ -1677,6 +2126,8 @@
 _install N ${SFL}/erc-join.elc	${DST}/erc-join.elc	444
 _install N ${SFL}/erc-lang.el.gz	${DST}/erc-lang.el.gz	444
 _install N ${SFL}/erc-lang.elc	${DST}/erc-lang.elc	444
+_install N ${SFL}/erc-list.el.gz	${DST}/erc-list.el.gz	444
+_install N ${SFL}/erc-list.elc	${DST}/erc-list.elc	444
 _install N ${SFL}/erc-log.el.gz	${DST}/erc-log.el.gz	444
 _install N ${SFL}/erc-log.elc	${DST}/erc-log.elc	444
 _install N ${SFL}/erc-match.el.gz	${DST}/erc-match.el.gz	444
@@ -1687,8 +2138,6 @@
 _install N ${SFL}/erc-netsplit.elc	${DST}/erc-netsplit.elc	444
 _install N ${SFL}/erc-networks.el.gz	${DST}/erc-networks.el.gz	444
 _install N ${SFL}/erc-networks.elc	${DST}/erc-networks.elc	444
-_install N ${SFL}/erc-nicklist.el.gz	${DST}/erc-nicklist.el.gz	444
-_install N ${SFL}/erc-nicklist.elc	${DST}/erc-nicklist.elc	444
 _install N ${SFL}/erc-notify.el.gz	${DST}/erc-notify.el.gz	444
 _install N ${SFL}/erc-notify.elc	${DST}/erc-notify.elc	444
 _install N ${SFL}/erc-page.el.gz	${DST}/erc-page.el.gz	444
@@ -1719,8 +2168,8 @@
 _install N ${SFL}/erc.elc	${DST}/erc.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/eshell"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/eshell"
+SFL="usr/share/emacs/23.1/lisp/eshell"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/eshell"
 _install N ${SFL}/em-alias.el.gz	${DST}/em-alias.el.gz	444
 _install N ${SFL}/em-alias.elc	${DST}/em-alias.elc	444
 _install N ${SFL}/em-banner.el.gz	${DST}/em-banner.el.gz	444
@@ -1762,7 +2211,6 @@
 _install N ${SFL}/esh-groups.el	${DST}/esh-groups.el	444
 _install N ${SFL}/esh-io.el.gz	${DST}/esh-io.el.gz	444
 _install N ${SFL}/esh-io.elc	${DST}/esh-io.elc	444
-_install N ${SFL}/esh-maint.el	${DST}/esh-maint.el	444
 _install N ${SFL}/esh-mode.el.gz	${DST}/esh-mode.el.gz	444
 _install N ${SFL}/esh-mode.elc	${DST}/esh-mode.elc	444
 _install N ${SFL}/esh-module.el.gz	${DST}/esh-module.el.gz	444
@@ -1781,26 +2229,22 @@
 _install N ${SFL}/eshell.elc	${DST}/eshell.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/gnus"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/gnus"
-_install N ${SFL}/binhex.el.gz	${DST}/binhex.el.gz	444
-_install N ${SFL}/binhex.elc	${DST}/binhex.elc	444
+SFL="usr/share/emacs/23.1/lisp/gnus"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/gnus"
+_install N ${SFL}/auth-source.el.gz	${DST}/auth-source.el.gz	444
+_install N ${SFL}/auth-source.elc	${DST}/auth-source.elc	444
 _install N ${SFL}/canlock.el.gz	${DST}/canlock.el.gz	444
 _install N ${SFL}/canlock.elc	${DST}/canlock.elc	444
 _install N ${SFL}/compface.el.gz	${DST}/compface.el.gz	444
 _install N ${SFL}/compface.elc	${DST}/compface.elc	444
 _install N ${SFL}/deuglify.el.gz	${DST}/deuglify.el.gz	444
 _install N ${SFL}/deuglify.elc	${DST}/deuglify.elc	444
-_install N ${SFL}/dig.el.gz	${DST}/dig.el.gz	444
-_install N ${SFL}/dig.elc	${DST}/dig.elc	444
-_install N ${SFL}/dns.el.gz	${DST}/dns.el.gz	444
-_install N ${SFL}/dns.elc	${DST}/dns.elc	444
 _install N ${SFL}/earcon.el.gz	${DST}/earcon.el.gz	444
 _install N ${SFL}/earcon.elc	${DST}/earcon.elc	444
+_install N ${SFL}/ecomplete.el.gz	${DST}/ecomplete.el.gz	444
+_install N ${SFL}/ecomplete.elc	${DST}/ecomplete.elc	444
 _install N ${SFL}/flow-fill.el.gz	${DST}/flow-fill.el.gz	444
 _install N ${SFL}/flow-fill.elc	${DST}/flow-fill.elc	444
-_install N ${SFL}/format-spec.el.gz	${DST}/format-spec.el.gz	444
-_install N ${SFL}/format-spec.elc	${DST}/format-spec.elc	444
 _install N ${SFL}/gmm-utils.el.gz	${DST}/gmm-utils.el.gz	444
 _install N ${SFL}/gmm-utils.elc	${DST}/gmm-utils.elc	444
 _install N ${SFL}/gnus-agent.el.gz	${DST}/gnus-agent.el.gz	444
@@ -1813,6 +2257,8 @@
 _install N ${SFL}/gnus-audio.elc	${DST}/gnus-audio.elc	444
 _install N ${SFL}/gnus-bcklg.el.gz	${DST}/gnus-bcklg.el.gz	444
 _install N ${SFL}/gnus-bcklg.elc	${DST}/gnus-bcklg.elc	444
+_install N ${SFL}/gnus-bookmark.el.gz	${DST}/gnus-bookmark.el.gz	444
+_install N ${SFL}/gnus-bookmark.elc	${DST}/gnus-bookmark.elc	444
 _install N ${SFL}/gnus-cache.el.gz	${DST}/gnus-cache.el.gz	444
 _install N ${SFL}/gnus-cache.elc	${DST}/gnus-cache.elc	444
 _install N ${SFL}/gnus-cite.el.gz	${DST}/gnus-cite.el.gz	444
@@ -1837,8 +2283,6 @@
 _install N ${SFL}/gnus-ems.elc	${DST}/gnus-ems.elc	444
 _install N ${SFL}/gnus-fun.el.gz	${DST}/gnus-fun.el.gz	444
 _install N ${SFL}/gnus-fun.elc	${DST}/gnus-fun.elc	444
-_install N ${SFL}/gnus-gl.el.gz	${DST}/gnus-gl.el.gz	444
-_install N ${SFL}/gnus-gl.elc	${DST}/gnus-gl.elc	444
 _install N ${SFL}/gnus-group.el.gz	${DST}/gnus-group.el.gz	444
 _install N ${SFL}/gnus-group.elc	${DST}/gnus-group.elc	444
 _install N ${SFL}/gnus-int.el.gz	${DST}/gnus-int.el.gz	444
@@ -1897,14 +2341,10 @@
 _install N ${SFL}/gnus-win.elc	${DST}/gnus-win.elc	444
 _install N ${SFL}/gnus.el.gz	${DST}/gnus.el.gz	444
 _install N ${SFL}/gnus.elc	${DST}/gnus.elc	444
-_install N ${SFL}/hex-util.el.gz	${DST}/hex-util.el.gz	444
-_install N ${SFL}/hex-util.elc	${DST}/hex-util.elc	444
 _install N ${SFL}/html2text.el.gz	${DST}/html2text.el.gz	444
 _install N ${SFL}/html2text.elc	${DST}/html2text.elc	444
 _install N ${SFL}/ietf-drums.el.gz	${DST}/ietf-drums.el.gz	444
 _install N ${SFL}/ietf-drums.elc	${DST}/ietf-drums.elc	444
-_install N ${SFL}/imap.el.gz	${DST}/imap.el.gz	444
-_install N ${SFL}/imap.elc	${DST}/imap.elc	444
 _install N ${SFL}/legacy-gnus-agent.el.gz	${DST}/legacy-gnus-agent.el.gz	444
 _install N ${SFL}/legacy-gnus-agent.elc	${DST}/legacy-gnus-agent.elc	444
 _install N ${SFL}/mail-parse.el.gz	${DST}/mail-parse.el.gz	444
@@ -1971,6 +2411,8 @@
 _install N ${SFL}/nnheader.elc	${DST}/nnheader.elc	444
 _install N ${SFL}/nnimap.el.gz	${DST}/nnimap.el.gz	444
 _install N ${SFL}/nnimap.elc	${DST}/nnimap.elc	444
+_install N ${SFL}/nnir.el.gz	${DST}/nnir.el.gz	444
+_install N ${SFL}/nnir.elc	${DST}/nnir.elc	444
 _install N ${SFL}/nnkiboze.el.gz	${DST}/nnkiboze.el.gz	444
 _install N ${SFL}/nnkiboze.elc	${DST}/nnkiboze.elc	444
 _install N ${SFL}/nnlistserv.el.gz	${DST}/nnlistserv.el.gz	444
@@ -1979,6 +2421,8 @@
 _install N ${SFL}/nnmail.elc	${DST}/nnmail.elc	444
 _install N ${SFL}/nnmaildir.el.gz	${DST}/nnmaildir.el.gz	444
 _install N ${SFL}/nnmaildir.elc	${DST}/nnmaildir.elc	444
+_install N ${SFL}/nnmairix.el.gz	${DST}/nnmairix.el.gz	444
+_install N ${SFL}/nnmairix.elc	${DST}/nnmairix.elc	444
 _install N ${SFL}/nnmbox.el.gz	${DST}/nnmbox.el.gz	444
 _install N ${SFL}/nnmbox.elc	${DST}/nnmbox.elc	444
 _install N ${SFL}/nnmh.el.gz	${DST}/nnmh.el.gz	444
@@ -2025,8 +2469,6 @@
 _install N ${SFL}/rfc2231.elc	${DST}/rfc2231.elc	444
 _install N ${SFL}/score-mode.el.gz	${DST}/score-mode.el.gz	444
 _install N ${SFL}/score-mode.elc	${DST}/score-mode.elc	444
-_install N ${SFL}/sha1.el.gz	${DST}/sha1.el.gz	444
-_install N ${SFL}/sha1.elc	${DST}/sha1.elc	444
 _install N ${SFL}/sieve-manage.el.gz	${DST}/sieve-manage.el.gz	444
 _install N ${SFL}/sieve-manage.elc	${DST}/sieve-manage.elc	444
 _install N ${SFL}/sieve-mode.el.gz	${DST}/sieve-mode.el.gz	444
@@ -2041,32 +2483,32 @@
 _install N ${SFL}/spam-report.elc	${DST}/spam-report.elc	444
 _install N ${SFL}/spam-stat.el.gz	${DST}/spam-stat.el.gz	444
 _install N ${SFL}/spam-stat.elc	${DST}/spam-stat.elc	444
+_install N ${SFL}/spam-wash.el.gz	${DST}/spam-wash.el.gz	444
+_install N ${SFL}/spam-wash.elc	${DST}/spam-wash.elc	444
 _install N ${SFL}/spam.el.gz	${DST}/spam.el.gz	444
 _install N ${SFL}/spam.elc	${DST}/spam.elc	444
 _install N ${SFL}/starttls.el.gz	${DST}/starttls.el.gz	444
 _install N ${SFL}/starttls.elc	${DST}/starttls.elc	444
 _install N ${SFL}/utf7.el.gz	${DST}/utf7.el.gz	444
 _install N ${SFL}/utf7.elc	${DST}/utf7.elc	444
-_install N ${SFL}/uudecode.el.gz	${DST}/uudecode.el.gz	444
-_install N ${SFL}/uudecode.elc	${DST}/uudecode.elc	444
 _install N ${SFL}/webmail.el.gz	${DST}/webmail.el.gz	444
 _install N ${SFL}/webmail.elc	${DST}/webmail.elc	444
 _install N ${SFL}/yenc.el.gz	${DST}/yenc.el.gz	444
 _install N ${SFL}/yenc.elc	${DST}/yenc.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/international"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/international"
+SFL="usr/share/emacs/23.1/lisp/international"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/international"
+_install N ${SFL}/README	${DST}/README	444
 _install N ${SFL}/ccl.el.gz	${DST}/ccl.el.gz	444
 _install N ${SFL}/ccl.elc	${DST}/ccl.elc	444
 _install N ${SFL}/characters.el.gz	${DST}/characters.el.gz	444
 _install N ${SFL}/characters.elc	${DST}/characters.elc	444
-_install N ${SFL}/code-pages.el.gz	${DST}/code-pages.el.gz	444
-_install N ${SFL}/code-pages.elc	${DST}/code-pages.elc	444
-_install N ${SFL}/codepage.el.gz	${DST}/codepage.el.gz	444
-_install N ${SFL}/codepage.elc	${DST}/codepage.elc	444
+_install N ${SFL}/charprop.el	${DST}/charprop.el	444
+_install N ${SFL}/cp51932.el	${DST}/cp51932.el	444
 _install N ${SFL}/encoded-kb.el.gz	${DST}/encoded-kb.el.gz	444
 _install N ${SFL}/encoded-kb.elc	${DST}/encoded-kb.elc	444
+_install N ${SFL}/eucjp-ms.el	${DST}/eucjp-ms.el	444
 _install N ${SFL}/fontset.el.gz	${DST}/fontset.el.gz	444
 _install N ${SFL}/fontset.elc	${DST}/fontset.elc	444
 _install N ${SFL}/isearch-x.el.gz	${DST}/isearch-x.el.gz	444
@@ -2087,13 +2529,6 @@
 _install N ${SFL}/kkc.elc	${DST}/kkc.elc	444
 _install N ${SFL}/latexenc.el.gz	${DST}/latexenc.el.gz	444
 _install N ${SFL}/latexenc.elc	${DST}/latexenc.elc	444
-_install N ${SFL}/latin-1.el	${DST}/latin-1.el	444
-_install N ${SFL}/latin-2.el	${DST}/latin-2.el	444
-_install N ${SFL}/latin-3.el	${DST}/latin-3.el	444
-_install N ${SFL}/latin-4.el	${DST}/latin-4.el	444
-_install N ${SFL}/latin-5.el	${DST}/latin-5.el	444
-_install N ${SFL}/latin-8.el	${DST}/latin-8.el	444
-_install N ${SFL}/latin-9.el	${DST}/latin-9.el	444
 _install N ${SFL}/latin1-disp.el.gz	${DST}/latin1-disp.el.gz	444
 _install N ${SFL}/latin1-disp.elc	${DST}/latin1-disp.elc	444
 _install N ${SFL}/mule-cmds.el.gz	${DST}/mule-cmds.el.gz	444
@@ -2109,28 +2544,32 @@
 _install N ${SFL}/ogonek.elc	${DST}/ogonek.elc	444
 _install N ${SFL}/quail.el.gz	${DST}/quail.el.gz	444
 _install N ${SFL}/quail.elc	${DST}/quail.elc	444
-_install N ${SFL}/subst-big5.el.gz	${DST}/subst-big5.el.gz	444
-_install N ${SFL}/subst-big5.elc	${DST}/subst-big5.elc	444
-_install N ${SFL}/subst-gb2312.el.gz	${DST}/subst-gb2312.el.gz	444
-_install N ${SFL}/subst-gb2312.elc	${DST}/subst-gb2312.elc	444
-_install N ${SFL}/subst-jis.el.gz	${DST}/subst-jis.el.gz	444
-_install N ${SFL}/subst-jis.elc	${DST}/subst-jis.elc	444
-_install N ${SFL}/subst-ksc.el.gz	${DST}/subst-ksc.el.gz	444
-_install N ${SFL}/subst-ksc.elc	${DST}/subst-ksc.elc	444
+_install N ${SFL}/robin.el.gz	${DST}/robin.el.gz	444
+_install N ${SFL}/robin.elc	${DST}/robin.elc	444
 _install N ${SFL}/titdic-cnv.el.gz	${DST}/titdic-cnv.el.gz	444
 _install N ${SFL}/titdic-cnv.elc	${DST}/titdic-cnv.elc	444
-_install N ${SFL}/ucs-tables.el.gz	${DST}/ucs-tables.el.gz	444
-_install N ${SFL}/ucs-tables.elc	${DST}/ucs-tables.elc	444
-_install N ${SFL}/utf-16.el.gz	${DST}/utf-16.el.gz	444
-_install N ${SFL}/utf-16.elc	${DST}/utf-16.elc	444
+_install N ${SFL}/uni-bidi.el	${DST}/uni-bidi.el	444
+_install N ${SFL}/uni-category.el	${DST}/uni-category.el	444
+_install N ${SFL}/uni-combining.el	${DST}/uni-combining.el	444
+_install N ${SFL}/uni-comment.el	${DST}/uni-comment.el	444
+_install N ${SFL}/uni-decimal.el	${DST}/uni-decimal.el	444
+_install N ${SFL}/uni-decomposition.el	${DST}/uni-decomposition.el	444
+_install N ${SFL}/uni-digit.el	${DST}/uni-digit.el	444
+_install N ${SFL}/uni-lowercase.el	${DST}/uni-lowercase.el	444
+_install N ${SFL}/uni-mirrored.el	${DST}/uni-mirrored.el	444
+_install N ${SFL}/uni-name.el	${DST}/uni-name.el	444
+_install N ${SFL}/uni-numeric.el	${DST}/uni-numeric.el	444
+_install N ${SFL}/uni-old-name.el	${DST}/uni-old-name.el	444
+_install N ${SFL}/uni-titlecase.el	${DST}/uni-titlecase.el	444
+_install N ${SFL}/uni-uppercase.el	${DST}/uni-uppercase.el	444
 _install N ${SFL}/utf-7.el.gz	${DST}/utf-7.el.gz	444
 _install N ${SFL}/utf-7.elc	${DST}/utf-7.elc	444
-_install N ${SFL}/utf-8.el.gz	${DST}/utf-8.el.gz	444
-_install N ${SFL}/utf-8.elc	${DST}/utf-8.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/language"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/language"
+SFL="usr/share/emacs/23.1/lisp/language"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/language"
+_install N ${SFL}/burmese.el	${DST}/burmese.el	444
+_install N ${SFL}/cham.el	${DST}/cham.el	444
 _install N ${SFL}/china-util.el.gz	${DST}/china-util.el.gz	444
 _install N ${SFL}/china-util.elc	${DST}/china-util.elc	444
 _install N ${SFL}/chinese.el.gz	${DST}/chinese.el.gz	444
@@ -2140,9 +2579,6 @@
 _install N ${SFL}/cyrillic.el.gz	${DST}/cyrillic.el.gz	444
 _install N ${SFL}/cyrillic.elc	${DST}/cyrillic.elc	444
 _install N ${SFL}/czech.el	${DST}/czech.el	444
-_install N ${SFL}/devan-util.el.gz	${DST}/devan-util.el.gz	444
-_install N ${SFL}/devan-util.elc	${DST}/devan-util.elc	444
-_install N ${SFL}/devanagari.el	${DST}/devanagari.el	444
 _install N ${SFL}/english.el	${DST}/english.el	444
 _install N ${SFL}/ethio-util.el.gz	${DST}/ethio-util.el.gz	444
 _install N ${SFL}/ethio-util.elc	${DST}/ethio-util.elc	444
@@ -2152,6 +2588,8 @@
 _install N ${SFL}/european.elc	${DST}/european.elc	444
 _install N ${SFL}/georgian.el	${DST}/georgian.el	444
 _install N ${SFL}/greek.el	${DST}/greek.el	444
+_install N ${SFL}/hanja-util.el.gz	${DST}/hanja-util.el.gz	444
+_install N ${SFL}/hanja-util.elc	${DST}/hanja-util.elc	444
 _install N ${SFL}/hebrew.el	${DST}/hebrew.el	444
 _install N ${SFL}/ind-util.el.gz	${DST}/ind-util.el.gz	444
 _install N ${SFL}/ind-util.elc	${DST}/ind-util.elc	444
@@ -2160,22 +2598,18 @@
 _install N ${SFL}/japan-util.el.gz	${DST}/japan-util.el.gz	444
 _install N ${SFL}/japan-util.elc	${DST}/japan-util.elc	444
 _install N ${SFL}/japanese.el	${DST}/japanese.el	444
-_install N ${SFL}/kannada.el	${DST}/kannada.el	444
-_install N ${SFL}/knd-util.el.gz	${DST}/knd-util.el.gz	444
-_install N ${SFL}/knd-util.elc	${DST}/knd-util.elc	444
+_install N ${SFL}/khmer.el	${DST}/khmer.el	444
 _install N ${SFL}/korea-util.el.gz	${DST}/korea-util.el.gz	444
 _install N ${SFL}/korea-util.elc	${DST}/korea-util.elc	444
 _install N ${SFL}/korean.el	${DST}/korean.el	444
 _install N ${SFL}/lao-util.el.gz	${DST}/lao-util.el.gz	444
 _install N ${SFL}/lao-util.elc	${DST}/lao-util.elc	444
 _install N ${SFL}/lao.el	${DST}/lao.el	444
-_install N ${SFL}/malayalam.el	${DST}/malayalam.el	444
 _install N ${SFL}/misc-lang.el	${DST}/misc-lang.el	444
-_install N ${SFL}/mlm-util.el.gz	${DST}/mlm-util.el.gz	444
-_install N ${SFL}/mlm-util.elc	${DST}/mlm-util.elc	444
 _install N ${SFL}/romanian.el	${DST}/romanian.el	444
+_install N ${SFL}/sinhala.el	${DST}/sinhala.el	444
 _install N ${SFL}/slovak.el	${DST}/slovak.el	444
-_install N ${SFL}/tamil.el	${DST}/tamil.el	444
+_install N ${SFL}/tai-viet.el	${DST}/tai-viet.el	444
 _install N ${SFL}/thai-util.el.gz	${DST}/thai-util.el.gz	444
 _install N ${SFL}/thai-util.elc	${DST}/thai-util.elc	444
 _install N ${SFL}/thai-word.el.gz	${DST}/thai-word.el.gz	444
@@ -2185,8 +2619,8 @@
 _install N ${SFL}/tibet-util.elc	${DST}/tibet-util.elc	444
 _install N ${SFL}/tibetan.el.gz	${DST}/tibetan.el.gz	444
 _install N ${SFL}/tibetan.elc	${DST}/tibetan.elc	444
-_install N ${SFL}/tml-util.el.gz	${DST}/tml-util.el.gz	444
-_install N ${SFL}/tml-util.elc	${DST}/tml-util.elc	444
+_install N ${SFL}/tv-util.el.gz	${DST}/tv-util.el.gz	444
+_install N ${SFL}/tv-util.elc	${DST}/tv-util.elc	444
 _install N ${SFL}/utf-8-lang.el	${DST}/utf-8-lang.el	444
 _install N ${SFL}/viet-util.el.gz	${DST}/viet-util.el.gz	444
 _install N ${SFL}/viet-util.elc	${DST}/viet-util.elc	444
@@ -2194,8 +2628,10 @@
 _install N ${SFL}/vietnamese.elc	${DST}/vietnamese.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/mail"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/mail"
+SFL="usr/share/emacs/23.1/lisp/mail"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/mail"
+_install N ${SFL}/binhex.el.gz	${DST}/binhex.el.gz	444
+_install N ${SFL}/binhex.elc	${DST}/binhex.elc	444
 _install N ${SFL}/blessmail.el	${DST}/blessmail.el	444
 _install N ${SFL}/emacsbug.el.gz	${DST}/emacsbug.el.gz	444
 _install N ${SFL}/emacsbug.elc	${DST}/emacsbug.elc	444
@@ -2203,6 +2639,8 @@
 _install N ${SFL}/feedmail.elc	${DST}/feedmail.elc	444
 _install N ${SFL}/footnote.el.gz	${DST}/footnote.el.gz	444
 _install N ${SFL}/footnote.elc	${DST}/footnote.elc	444
+_install N ${SFL}/hashcash.el.gz	${DST}/hashcash.el.gz	444
+_install N ${SFL}/hashcash.elc	${DST}/hashcash.elc	444
 _install N ${SFL}/mail-extr.el.gz	${DST}/mail-extr.el.gz	444
 _install N ${SFL}/mail-extr.elc	${DST}/mail-extr.elc	444
 _install N ${SFL}/mail-hist.el.gz	${DST}/mail-hist.el.gz	444
@@ -2237,6 +2675,8 @@
 _install N ${SFL}/rmailedit.elc	${DST}/rmailedit.elc	444
 _install N ${SFL}/rmailkwd.el.gz	${DST}/rmailkwd.el.gz	444
 _install N ${SFL}/rmailkwd.elc	${DST}/rmailkwd.elc	444
+_install N ${SFL}/rmailmm.el.gz	${DST}/rmailmm.el.gz	444
+_install N ${SFL}/rmailmm.elc	${DST}/rmailmm.elc	444
 _install N ${SFL}/rmailmsc.el.gz	${DST}/rmailmsc.el.gz	444
 _install N ${SFL}/rmailmsc.elc	${DST}/rmailmsc.elc	444
 _install N ${SFL}/rmailout.el.gz	${DST}/rmailout.el.gz	444
@@ -2257,12 +2697,12 @@
 _install N ${SFL}/undigest.elc	${DST}/undigest.elc	444
 _install N ${SFL}/unrmail.el.gz	${DST}/unrmail.el.gz	444
 _install N ${SFL}/unrmail.elc	${DST}/unrmail.elc	444
-_install N ${SFL}/vms-pmail.el.gz	${DST}/vms-pmail.el.gz	444
-_install N ${SFL}/vms-pmail.elc	${DST}/vms-pmail.elc	444
+_install N ${SFL}/uudecode.el.gz	${DST}/uudecode.el.gz	444
+_install N ${SFL}/uudecode.elc	${DST}/uudecode.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/mh-e"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/mh-e"
+SFL="usr/share/emacs/23.1/lisp/mh-e"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/mh-e"
 _install N ${SFL}/mh-acros.el	${DST}/mh-acros.el	444
 _install N ${SFL}/mh-alias.el.gz	${DST}/mh-alias.el.gz	444
 _install N ${SFL}/mh-alias.elc	${DST}/mh-alias.elc	444
@@ -2313,12 +2753,18 @@
 _install N ${SFL}/mh-xface.elc	${DST}/mh-xface.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/net"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/net"
+SFL="usr/share/emacs/23.1/lisp/net"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/net"
 _install N ${SFL}/ange-ftp.el.gz	${DST}/ange-ftp.el.gz	444
 _install N ${SFL}/ange-ftp.elc	${DST}/ange-ftp.elc	444
 _install N ${SFL}/browse-url.el.gz	${DST}/browse-url.el.gz	444
 _install N ${SFL}/browse-url.elc	${DST}/browse-url.elc	444
+_install N ${SFL}/dbus.el.gz	${DST}/dbus.el.gz	444
+_install N ${SFL}/dbus.elc	${DST}/dbus.elc	444
+_install N ${SFL}/dig.el.gz	${DST}/dig.el.gz	444
+_install N ${SFL}/dig.elc	${DST}/dig.elc	444
+_install N ${SFL}/dns.el.gz	${DST}/dns.el.gz	444
+_install N ${SFL}/dns.elc	${DST}/dns.elc	444
 _install N ${SFL}/eudc-bob.el.gz	${DST}/eudc-bob.el.gz	444
 _install N ${SFL}/eudc-bob.elc	${DST}/eudc-bob.elc	444
 _install N ${SFL}/eudc-export.el.gz	${DST}/eudc-export.el.gz	444
@@ -2339,14 +2785,34 @@
 _install N ${SFL}/eudcb-ph.elc	${DST}/eudcb-ph.elc	444
 _install N ${SFL}/goto-addr.el.gz	${DST}/goto-addr.el.gz	444
 _install N ${SFL}/goto-addr.elc	${DST}/goto-addr.elc	444
+_install N ${SFL}/hmac-def.el.gz	${DST}/hmac-def.el.gz	444
+_install N ${SFL}/hmac-def.elc	${DST}/hmac-def.elc	444
+_install N ${SFL}/hmac-md5.el.gz	${DST}/hmac-md5.el.gz	444
+_install N ${SFL}/hmac-md5.elc	${DST}/hmac-md5.elc	444
+_install N ${SFL}/imap.el.gz	${DST}/imap.el.gz	444
+_install N ${SFL}/imap.elc	${DST}/imap.elc	444
 _install N ${SFL}/ldap.el.gz	${DST}/ldap.el.gz	444
 _install N ${SFL}/ldap.elc	${DST}/ldap.elc	444
+_install N ${SFL}/mairix.el.gz	${DST}/mairix.el.gz	444
+_install N ${SFL}/mairix.elc	${DST}/mairix.elc	444
 _install N ${SFL}/net-utils.el.gz	${DST}/net-utils.el.gz	444
 _install N ${SFL}/net-utils.elc	${DST}/net-utils.elc	444
 _install N ${SFL}/netrc.el.gz	${DST}/netrc.el.gz	444
 _install N ${SFL}/netrc.elc	${DST}/netrc.elc	444
+_install N ${SFL}/newst-backend.el.gz	${DST}/newst-backend.el.gz	444
+_install N ${SFL}/newst-backend.elc	${DST}/newst-backend.elc	444
+_install N ${SFL}/newst-plainview.el.gz	${DST}/newst-plainview.el.gz	444
+_install N ${SFL}/newst-plainview.elc	${DST}/newst-plainview.elc	444
+_install N ${SFL}/newst-reader.el.gz	${DST}/newst-reader.el.gz	444
+_install N ${SFL}/newst-reader.elc	${DST}/newst-reader.elc	444
+_install N ${SFL}/newst-ticker.el.gz	${DST}/newst-ticker.el.gz	444
+_install N ${SFL}/newst-ticker.elc	${DST}/newst-ticker.elc	444
+_install N ${SFL}/newst-treeview.el.gz	${DST}/newst-treeview.el.gz	444
+_install N ${SFL}/newst-treeview.elc	${DST}/newst-treeview.elc	444
 _install N ${SFL}/newsticker.el.gz	${DST}/newsticker.el.gz	444
 _install N ${SFL}/newsticker.elc	${DST}/newsticker.elc	444
+_install N ${SFL}/ntlm.el.gz	${DST}/ntlm.el.gz	444
+_install N ${SFL}/ntlm.elc	${DST}/ntlm.elc	444
 _install N ${SFL}/quickurl.el.gz	${DST}/quickurl.el.gz	444
 _install N ${SFL}/quickurl.elc	${DST}/quickurl.elc	444
 _install N ${SFL}/rcirc.el.gz	${DST}/rcirc.el.gz	444
@@ -2355,46 +2821,109 @@
 _install N ${SFL}/rcompile.elc	${DST}/rcompile.elc	444
 _install N ${SFL}/rlogin.el.gz	${DST}/rlogin.el.gz	444
 _install N ${SFL}/rlogin.elc	${DST}/rlogin.elc	444
+_install N ${SFL}/sasl-cram.el.gz	${DST}/sasl-cram.el.gz	444
+_install N ${SFL}/sasl-cram.elc	${DST}/sasl-cram.elc	444
+_install N ${SFL}/sasl-digest.el.gz	${DST}/sasl-digest.el.gz	444
+_install N ${SFL}/sasl-digest.elc	${DST}/sasl-digest.elc	444
+_install N ${SFL}/sasl-ntlm.el.gz	${DST}/sasl-ntlm.el.gz	444
+_install N ${SFL}/sasl-ntlm.elc	${DST}/sasl-ntlm.elc	444
+_install N ${SFL}/sasl.el.gz	${DST}/sasl.el.gz	444
+_install N ${SFL}/sasl.elc	${DST}/sasl.elc	444
 _install N ${SFL}/snmp-mode.el.gz	${DST}/snmp-mode.el.gz	444
 _install N ${SFL}/snmp-mode.elc	${DST}/snmp-mode.elc	444
+_install N ${SFL}/socks.el.gz	${DST}/socks.el.gz	444
+_install N ${SFL}/socks.elc	${DST}/socks.elc	444
 _install N ${SFL}/telnet.el.gz	${DST}/telnet.el.gz	444
 _install N ${SFL}/telnet.elc	${DST}/telnet.elc	444
 _install N ${SFL}/tls.el.gz	${DST}/tls.el.gz	444
 _install N ${SFL}/tls.elc	${DST}/tls.elc	444
+_install N ${SFL}/tramp-cache.el.gz	${DST}/tramp-cache.el.gz	444
+_install N ${SFL}/tramp-cache.elc	${DST}/tramp-cache.elc	444
+_install N ${SFL}/tramp-cmds.el.gz	${DST}/tramp-cmds.el.gz	444
+_install N ${SFL}/tramp-cmds.elc	${DST}/tramp-cmds.elc	444
+_install N ${SFL}/tramp-compat.el.gz	${DST}/tramp-compat.el.gz	444
+_install N ${SFL}/tramp-compat.elc	${DST}/tramp-compat.elc	444
+_install N ${SFL}/tramp-fish.el.gz	${DST}/tramp-fish.el.gz	444
+_install N ${SFL}/tramp-fish.elc	${DST}/tramp-fish.elc	444
 _install N ${SFL}/tramp-ftp.el.gz	${DST}/tramp-ftp.el.gz	444
 _install N ${SFL}/tramp-ftp.elc	${DST}/tramp-ftp.elc	444
+_install N ${SFL}/tramp-gw.el.gz	${DST}/tramp-gw.el.gz	444
+_install N ${SFL}/tramp-gw.elc	${DST}/tramp-gw.elc	444
 _install N ${SFL}/tramp-smb.el.gz	${DST}/tramp-smb.el.gz	444
 _install N ${SFL}/tramp-smb.elc	${DST}/tramp-smb.elc	444
-_install N ${SFL}/tramp-util.el.gz	${DST}/tramp-util.el.gz	444
-_install N ${SFL}/tramp-util.elc	${DST}/tramp-util.elc	444
 _install N ${SFL}/tramp-uu.el.gz	${DST}/tramp-uu.el.gz	444
 _install N ${SFL}/tramp-uu.elc	${DST}/tramp-uu.elc	444
-_install N ${SFL}/tramp-vc.el.gz	${DST}/tramp-vc.el.gz	444
-_install N ${SFL}/tramp-vc.elc	${DST}/tramp-vc.elc	444
 _install N ${SFL}/tramp.el.gz	${DST}/tramp.el.gz	444
 _install N ${SFL}/tramp.elc	${DST}/tramp.elc	444
 _install N ${SFL}/trampver.el.gz	${DST}/trampver.el.gz	444
 _install N ${SFL}/trampver.elc	${DST}/trampver.elc	444
 _install N ${SFL}/webjump.el.gz	${DST}/webjump.el.gz	444
 _install N ${SFL}/webjump.elc	${DST}/webjump.elc	444
+_install N ${SFL}/xesam.el.gz	${DST}/xesam.el.gz	444
+_install N ${SFL}/xesam.elc	${DST}/xesam.elc	444
+_install N ${SFL}/zeroconf.el.gz	${DST}/zeroconf.el.gz	444
+_install N ${SFL}/zeroconf.elc	${DST}/zeroconf.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/obsolete"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/obsolete"
-_install N ${SFL}/auto-show.el.gz	${DST}/auto-show.el.gz	444
-_install N ${SFL}/auto-show.elc	${DST}/auto-show.elc	444
+SFL="usr/share/emacs/23.1/lisp/nxml"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/nxml"
+_install N ${SFL}/TODO	${DST}/TODO	444
+_install N ${SFL}/nxml-enc.el.gz	${DST}/nxml-enc.el.gz	444
+_install N ${SFL}/nxml-enc.elc	${DST}/nxml-enc.elc	444
+_install N ${SFL}/nxml-glyph.el.gz	${DST}/nxml-glyph.el.gz	444
+_install N ${SFL}/nxml-glyph.elc	${DST}/nxml-glyph.elc	444
+_install N ${SFL}/nxml-maint.el.gz	${DST}/nxml-maint.el.gz	444
+_install N ${SFL}/nxml-maint.elc	${DST}/nxml-maint.elc	444
+_install N ${SFL}/nxml-mode.el.gz	${DST}/nxml-mode.el.gz	444
+_install N ${SFL}/nxml-mode.elc	${DST}/nxml-mode.elc	444
+_install N ${SFL}/nxml-ns.el.gz	${DST}/nxml-ns.el.gz	444
+_install N ${SFL}/nxml-ns.elc	${DST}/nxml-ns.elc	444
+_install N ${SFL}/nxml-outln.el.gz	${DST}/nxml-outln.el.gz	444
+_install N ${SFL}/nxml-outln.elc	${DST}/nxml-outln.elc	444
+_install N ${SFL}/nxml-parse.el.gz	${DST}/nxml-parse.el.gz	444
+_install N ${SFL}/nxml-parse.elc	${DST}/nxml-parse.elc	444
+_install N ${SFL}/nxml-rap.el.gz	${DST}/nxml-rap.el.gz	444
+_install N ${SFL}/nxml-rap.elc	${DST}/nxml-rap.elc	444
+_install N ${SFL}/nxml-uchnm.el.gz	${DST}/nxml-uchnm.el.gz	444
+_install N ${SFL}/nxml-uchnm.elc	${DST}/nxml-uchnm.elc	444
+_install N ${SFL}/nxml-util.el.gz	${DST}/nxml-util.el.gz	444
+_install N ${SFL}/nxml-util.elc	${DST}/nxml-util.elc	444
+_install N ${SFL}/rng-cmpct.el.gz	${DST}/rng-cmpct.el.gz	444
+_install N ${SFL}/rng-cmpct.elc	${DST}/rng-cmpct.elc	444
+_install N ${SFL}/rng-dt.el.gz	${DST}/rng-dt.el.gz	444
+_install N ${SFL}/rng-dt.elc	${DST}/rng-dt.elc	444
+_install N ${SFL}/rng-loc.el.gz	${DST}/rng-loc.el.gz	444
+_install N ${SFL}/rng-loc.elc	${DST}/rng-loc.elc	444
+_install N ${SFL}/rng-maint.el.gz	${DST}/rng-maint.el.gz	444
+_install N ${SFL}/rng-maint.elc	${DST}/rng-maint.elc	444
+_install N ${SFL}/rng-match.el.gz	${DST}/rng-match.el.gz	444
+_install N ${SFL}/rng-match.elc	${DST}/rng-match.elc	444
+_install N ${SFL}/rng-nxml.el.gz	${DST}/rng-nxml.el.gz	444
+_install N ${SFL}/rng-nxml.elc	${DST}/rng-nxml.elc	444
+_install N ${SFL}/rng-parse.el.gz	${DST}/rng-parse.el.gz	444
+_install N ${SFL}/rng-parse.elc	${DST}/rng-parse.elc	444
+_install N ${SFL}/rng-pttrn.el.gz	${DST}/rng-pttrn.el.gz	444
+_install N ${SFL}/rng-pttrn.elc	${DST}/rng-pttrn.elc	444
+_install N ${SFL}/rng-uri.el.gz	${DST}/rng-uri.el.gz	444
+_install N ${SFL}/rng-uri.elc	${DST}/rng-uri.elc	444
+_install N ${SFL}/rng-util.el.gz	${DST}/rng-util.el.gz	444
+_install N ${SFL}/rng-util.elc	${DST}/rng-util.elc	444
+_install N ${SFL}/rng-valid.el.gz	${DST}/rng-valid.el.gz	444
+_install N ${SFL}/rng-valid.elc	${DST}/rng-valid.elc	444
+_install N ${SFL}/rng-xsd.el.gz	${DST}/rng-xsd.el.gz	444
+_install N ${SFL}/rng-xsd.elc	${DST}/rng-xsd.elc	444
+_install N ${SFL}/xmltok.el.gz	${DST}/xmltok.el.gz	444
+_install N ${SFL}/xmltok.elc	${DST}/xmltok.elc	444
+_install N ${SFL}/xsd-regexp.el.gz	${DST}/xsd-regexp.el.gz	444
+_install N ${SFL}/xsd-regexp.elc	${DST}/xsd-regexp.elc	444
+
+
+SFL="usr/share/emacs/23.1/lisp/obsolete"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/obsolete"
 _install N ${SFL}/awk-mode.el.gz	${DST}/awk-mode.el.gz	444
 _install N ${SFL}/awk-mode.elc	${DST}/awk-mode.elc	444
-_install N ${SFL}/bg-mouse.el.gz	${DST}/bg-mouse.el.gz	444
-_install N ${SFL}/bg-mouse.elc	${DST}/bg-mouse.elc	444
 _install N ${SFL}/fast-lock.el.gz	${DST}/fast-lock.el.gz	444
 _install N ${SFL}/fast-lock.elc	${DST}/fast-lock.elc	444
-_install N ${SFL}/float.el.gz	${DST}/float.el.gz	444
-_install N ${SFL}/float.elc	${DST}/float.elc	444
-_install N ${SFL}/hilit19.el.gz	${DST}/hilit19.el.gz	444
-_install N ${SFL}/hilit19.elc	${DST}/hilit19.elc	444
-_install N ${SFL}/hscroll.el.gz	${DST}/hscroll.el.gz	444
-_install N ${SFL}/hscroll.elc	${DST}/hscroll.elc	444
 _install N ${SFL}/iso-acc.el.gz	${DST}/iso-acc.el.gz	444
 _install N ${SFL}/iso-acc.elc	${DST}/iso-acc.elc	444
 _install N ${SFL}/iso-insert.el.gz	${DST}/iso-insert.el.gz	444
@@ -2404,40 +2933,102 @@
 _install N ${SFL}/keyswap.el	${DST}/keyswap.el	444
 _install N ${SFL}/lazy-lock.el.gz	${DST}/lazy-lock.el.gz	444
 _install N ${SFL}/lazy-lock.elc	${DST}/lazy-lock.elc	444
-_install N ${SFL}/mlsupport.el.gz	${DST}/mlsupport.el.gz	444
-_install N ${SFL}/mlsupport.elc	${DST}/mlsupport.elc	444
-_install N ${SFL}/ooutline.el.gz	${DST}/ooutline.el.gz	444
-_install N ${SFL}/ooutline.elc	${DST}/ooutline.elc	444
+_install N ${SFL}/old-whitespace.el.gz	${DST}/old-whitespace.el.gz	444
+_install N ${SFL}/old-whitespace.elc	${DST}/old-whitespace.elc	444
 _install N ${SFL}/options.el.gz	${DST}/options.el.gz	444
 _install N ${SFL}/options.elc	${DST}/options.elc	444
-_install N ${SFL}/profile.el.gz	${DST}/profile.el.gz	444
-_install N ${SFL}/profile.elc	${DST}/profile.elc	444
+_install N ${SFL}/resume.el.gz	${DST}/resume.el.gz	444
+_install N ${SFL}/resume.elc	${DST}/resume.elc	444
 _install N ${SFL}/rnews.el.gz	${DST}/rnews.el.gz	444
 _install N ${SFL}/rnews.elc	${DST}/rnews.elc	444
 _install N ${SFL}/rnewspost.el.gz	${DST}/rnewspost.el.gz	444
 _install N ${SFL}/rnewspost.elc	${DST}/rnewspost.elc	444
-_install N ${SFL}/rsz-mini.el.gz	${DST}/rsz-mini.el.gz	444
-_install N ${SFL}/rsz-mini.elc	${DST}/rsz-mini.elc	444
 _install N ${SFL}/sc.el.gz	${DST}/sc.el.gz	444
 _install N ${SFL}/sc.elc	${DST}/sc.elc	444
 _install N ${SFL}/scribe.el.gz	${DST}/scribe.el.gz	444
 _install N ${SFL}/scribe.elc	${DST}/scribe.elc	444
-_install N ${SFL}/sun-curs.el.gz	${DST}/sun-curs.el.gz	444
-_install N ${SFL}/sun-curs.elc	${DST}/sun-curs.elc	444
-_install N ${SFL}/sun-fns.el.gz	${DST}/sun-fns.el.gz	444
-_install N ${SFL}/sun-fns.elc	${DST}/sun-fns.elc	444
 _install N ${SFL}/swedish.el.gz	${DST}/swedish.el.gz	444
 _install N ${SFL}/swedish.elc	${DST}/swedish.elc	444
-_install N ${SFL}/uncompress.el.gz	${DST}/uncompress.el.gz	444
-_install N ${SFL}/uncompress.elc	${DST}/uncompress.elc	444
-_install N ${SFL}/x-apollo.el.gz	${DST}/x-apollo.el.gz	444
-_install N ${SFL}/x-apollo.elc	${DST}/x-apollo.elc	444
+_install N ${SFL}/vc-mcvs.el.gz	${DST}/vc-mcvs.el.gz	444
+_install N ${SFL}/vc-mcvs.elc	${DST}/vc-mcvs.elc	444
 _install N ${SFL}/x-menu.el.gz	${DST}/x-menu.el.gz	444
 _install N ${SFL}/x-menu.elc	${DST}/x-menu.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/play"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/play"
+SFL="usr/share/emacs/23.1/lisp/org"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/org"
+_install N ${SFL}/org-agenda.el.gz	${DST}/org-agenda.el.gz	444
+_install N ${SFL}/org-agenda.elc	${DST}/org-agenda.elc	444
+_install N ${SFL}/org-archive.el.gz	${DST}/org-archive.el.gz	444
+_install N ${SFL}/org-archive.elc	${DST}/org-archive.elc	444
+_install N ${SFL}/org-attach.el.gz	${DST}/org-attach.el.gz	444
+_install N ${SFL}/org-attach.elc	${DST}/org-attach.elc	444
+_install N ${SFL}/org-bbdb.el.gz	${DST}/org-bbdb.el.gz	444
+_install N ${SFL}/org-bbdb.elc	${DST}/org-bbdb.elc	444
+_install N ${SFL}/org-bibtex.el.gz	${DST}/org-bibtex.el.gz	444
+_install N ${SFL}/org-bibtex.elc	${DST}/org-bibtex.elc	444
+_install N ${SFL}/org-clock.el.gz	${DST}/org-clock.el.gz	444
+_install N ${SFL}/org-clock.elc	${DST}/org-clock.elc	444
+_install N ${SFL}/org-colview.el.gz	${DST}/org-colview.el.gz	444
+_install N ${SFL}/org-colview.elc	${DST}/org-colview.elc	444
+_install N ${SFL}/org-compat.el.gz	${DST}/org-compat.el.gz	444
+_install N ${SFL}/org-compat.elc	${DST}/org-compat.elc	444
+_install N ${SFL}/org-exp.el.gz	${DST}/org-exp.el.gz	444
+_install N ${SFL}/org-exp.elc	${DST}/org-exp.elc	444
+_install N ${SFL}/org-export-latex.el.gz	${DST}/org-export-latex.el.gz	444
+_install N ${SFL}/org-export-latex.elc	${DST}/org-export-latex.elc	444
+_install N ${SFL}/org-faces.el.gz	${DST}/org-faces.el.gz	444
+_install N ${SFL}/org-faces.elc	${DST}/org-faces.elc	444
+_install N ${SFL}/org-footnote.el.gz	${DST}/org-footnote.el.gz	444
+_install N ${SFL}/org-footnote.elc	${DST}/org-footnote.elc	444
+_install N ${SFL}/org-gnus.el.gz	${DST}/org-gnus.el.gz	444
+_install N ${SFL}/org-gnus.elc	${DST}/org-gnus.elc	444
+_install N ${SFL}/org-id.el.gz	${DST}/org-id.el.gz	444
+_install N ${SFL}/org-id.elc	${DST}/org-id.elc	444
+_install N ${SFL}/org-info.el.gz	${DST}/org-info.el.gz	444
+_install N ${SFL}/org-info.elc	${DST}/org-info.elc	444
+_install N ${SFL}/org-install.el.gz	${DST}/org-install.el.gz	444
+_install N ${SFL}/org-install.elc	${DST}/org-install.elc	444
+_install N ${SFL}/org-irc.el.gz	${DST}/org-irc.el.gz	444
+_install N ${SFL}/org-irc.elc	${DST}/org-irc.elc	444
+_install N ${SFL}/org-jsinfo.el.gz	${DST}/org-jsinfo.el.gz	444
+_install N ${SFL}/org-jsinfo.elc	${DST}/org-jsinfo.elc	444
+_install N ${SFL}/org-list.el.gz	${DST}/org-list.el.gz	444
+_install N ${SFL}/org-list.elc	${DST}/org-list.elc	444
+_install N ${SFL}/org-mac-message.el.gz	${DST}/org-mac-message.el.gz	444
+_install N ${SFL}/org-mac-message.elc	${DST}/org-mac-message.elc	444
+_install N ${SFL}/org-macs.el.gz	${DST}/org-macs.el.gz	444
+_install N ${SFL}/org-macs.elc	${DST}/org-macs.elc	444
+_install N ${SFL}/org-mew.el.gz	${DST}/org-mew.el.gz	444
+_install N ${SFL}/org-mew.elc	${DST}/org-mew.elc	444
+_install N ${SFL}/org-mhe.el.gz	${DST}/org-mhe.el.gz	444
+_install N ${SFL}/org-mhe.elc	${DST}/org-mhe.elc	444
+_install N ${SFL}/org-mouse.el.gz	${DST}/org-mouse.el.gz	444
+_install N ${SFL}/org-mouse.elc	${DST}/org-mouse.elc	444
+_install N ${SFL}/org-plot.el.gz	${DST}/org-plot.el.gz	444
+_install N ${SFL}/org-plot.elc	${DST}/org-plot.elc	444
+_install N ${SFL}/org-publish.el.gz	${DST}/org-publish.el.gz	444
+_install N ${SFL}/org-publish.elc	${DST}/org-publish.elc	444
+_install N ${SFL}/org-remember.el.gz	${DST}/org-remember.el.gz	444
+_install N ${SFL}/org-remember.elc	${DST}/org-remember.elc	444
+_install N ${SFL}/org-rmail.el.gz	${DST}/org-rmail.el.gz	444
+_install N ${SFL}/org-rmail.elc	${DST}/org-rmail.elc	444
+_install N ${SFL}/org-table.el.gz	${DST}/org-table.el.gz	444
+_install N ${SFL}/org-table.elc	${DST}/org-table.elc	444
+_install N ${SFL}/org-timer.el.gz	${DST}/org-timer.el.gz	444
+_install N ${SFL}/org-timer.elc	${DST}/org-timer.elc	444
+_install N ${SFL}/org-vm.el.gz	${DST}/org-vm.el.gz	444
+_install N ${SFL}/org-vm.elc	${DST}/org-vm.elc	444
+_install N ${SFL}/org-w3m.el.gz	${DST}/org-w3m.el.gz	444
+_install N ${SFL}/org-w3m.elc	${DST}/org-w3m.elc	444
+_install N ${SFL}/org-wl.el.gz	${DST}/org-wl.el.gz	444
+_install N ${SFL}/org-wl.elc	${DST}/org-wl.elc	444
+_install N ${SFL}/org.el.gz	${DST}/org.el.gz	444
+_install N ${SFL}/org.elc	${DST}/org.elc	444
+
+
+SFL="usr/share/emacs/23.1/lisp/play"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/play"
 _install N ${SFL}/5x5.el.gz	${DST}/5x5.el.gz	444
 _install N ${SFL}/5x5.elc	${DST}/5x5.elc	444
 _install N ${SFL}/animate.el.gz	${DST}/animate.el.gz	444
@@ -2445,6 +3036,8 @@
 _install N ${SFL}/blackbox.el.gz	${DST}/blackbox.el.gz	444
 _install N ${SFL}/blackbox.elc	${DST}/blackbox.elc	444
 _install N ${SFL}/bruce.el	${DST}/bruce.el	444
+_install N ${SFL}/bubbles.el.gz	${DST}/bubbles.el.gz	444
+_install N ${SFL}/bubbles.elc	${DST}/bubbles.elc	444
 _install N ${SFL}/cookie1.el.gz	${DST}/cookie1.el.gz	444
 _install N ${SFL}/cookie1.elc	${DST}/cookie1.elc	444
 _install N ${SFL}/decipher.el.gz	${DST}/decipher.el.gz	444
@@ -2495,8 +3088,8 @@
 _install N ${SFL}/zone.elc	${DST}/zone.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/progmodes"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/progmodes"
+SFL="usr/share/emacs/23.1/lisp/progmodes"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/progmodes"
 _install N ${SFL}/ada-mode.el.gz	${DST}/ada-mode.el.gz	444
 _install N ${SFL}/ada-mode.elc	${DST}/ada-mode.elc	444
 _install N ${SFL}/ada-prj.el.gz	${DST}/ada-prj.el.gz	444
@@ -2511,6 +3104,10 @@
 _install N ${SFL}/asm-mode.elc	${DST}/asm-mode.elc	444
 _install N ${SFL}/autoconf.el.gz	${DST}/autoconf.el.gz	444
 _install N ${SFL}/autoconf.elc	${DST}/autoconf.elc	444
+_install N ${SFL}/bug-reference.el.gz	${DST}/bug-reference.el.gz	444
+_install N ${SFL}/bug-reference.elc	${DST}/bug-reference.elc	444
+_install N ${SFL}/cap-words.el.gz	${DST}/cap-words.el.gz	444
+_install N ${SFL}/cap-words.elc	${DST}/cap-words.elc	444
 _install N ${SFL}/cc-align.el.gz	${DST}/cc-align.el.gz	444
 _install N ${SFL}/cc-align.elc	${DST}/cc-align.elc	444
 _install N ${SFL}/cc-awk.el.gz	${DST}/cc-awk.el.gz	444
@@ -2623,8 +3220,6 @@
 _install N ${SFL}/mixal-mode.elc	${DST}/mixal-mode.elc	444
 _install N ${SFL}/modula2.el.gz	${DST}/modula2.el.gz	444
 _install N ${SFL}/modula2.elc	${DST}/modula2.elc	444
-_install N ${SFL}/octave-hlp.el.gz	${DST}/octave-hlp.el.gz	444
-_install N ${SFL}/octave-hlp.elc	${DST}/octave-hlp.elc	444
 _install N ${SFL}/octave-inf.el.gz	${DST}/octave-inf.el.gz	444
 _install N ${SFL}/octave-inf.elc	${DST}/octave-inf.elc	444
 _install N ${SFL}/octave-mod.el.gz	${DST}/octave-mod.el.gz	444
@@ -2639,6 +3234,8 @@
 _install N ${SFL}/ps-mode.elc	${DST}/ps-mode.elc	444
 _install N ${SFL}/python.el.gz	${DST}/python.el.gz	444
 _install N ${SFL}/python.elc	${DST}/python.elc	444
+_install N ${SFL}/ruby-mode.el.gz	${DST}/ruby-mode.el.gz	444
+_install N ${SFL}/ruby-mode.elc	${DST}/ruby-mode.elc	444
 _install N ${SFL}/scheme.el.gz	${DST}/scheme.el.gz	444
 _install N ${SFL}/scheme.elc	${DST}/scheme.elc	444
 _install N ${SFL}/sh-script.el.gz	${DST}/sh-script.el.gz	444
@@ -2647,8 +3244,14 @@
 _install N ${SFL}/simula.elc	${DST}/simula.elc	444
 _install N ${SFL}/sql.el.gz	${DST}/sql.el.gz	444
 _install N ${SFL}/sql.elc	${DST}/sql.elc	444
+_install N ${SFL}/sym-comp.el.gz	${DST}/sym-comp.el.gz	444
+_install N ${SFL}/sym-comp.elc	${DST}/sym-comp.elc	444
 _install N ${SFL}/tcl.el.gz	${DST}/tcl.el.gz	444
 _install N ${SFL}/tcl.elc	${DST}/tcl.elc	444
+_install N ${SFL}/vera-mode.el.gz	${DST}/vera-mode.el.gz	444
+_install N ${SFL}/vera-mode.elc	${DST}/vera-mode.elc	444
+_install N ${SFL}/verilog-mode.el.gz	${DST}/verilog-mode.el.gz	444
+_install N ${SFL}/verilog-mode.elc	${DST}/verilog-mode.elc	444
 _install N ${SFL}/vhdl-mode.el.gz	${DST}/vhdl-mode.el.gz	444
 _install N ${SFL}/vhdl-mode.elc	${DST}/vhdl-mode.elc	444
 _install N ${SFL}/which-func.el.gz	${DST}/which-func.el.gz	444
@@ -2657,26 +3260,27 @@
 _install N ${SFL}/xscheme.elc	${DST}/xscheme.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/term"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/term"
+SFL="usr/share/emacs/23.1/lisp/term"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/term"
 _install N ${SFL}/AT386.el	${DST}/AT386.el	444
 _install N ${SFL}/README	${DST}/README	444
 _install N ${SFL}/apollo.el	${DST}/apollo.el	444
 _install N ${SFL}/bobcat.el	${DST}/bobcat.el	444
+_install N ${SFL}/common-win.el.gz	${DST}/common-win.el.gz	444
+_install N ${SFL}/common-win.elc	${DST}/common-win.elc	444
 _install N ${SFL}/cygwin.el	${DST}/cygwin.el	444
-_install N ${SFL}/internal.el	${DST}/internal.el	444
+_install N ${SFL}/internal.el.gz	${DST}/internal.el.gz	444
+_install N ${SFL}/internal.elc	${DST}/internal.elc	444
 _install N ${SFL}/iris-ansi.el	${DST}/iris-ansi.el	444
 _install N ${SFL}/linux.el	${DST}/linux.el	444
 _install N ${SFL}/lk201.el	${DST}/lk201.el	444
-_install N ${SFL}/mac-win.el.gz	${DST}/mac-win.el.gz	444
-_install N ${SFL}/mac-win.elc	${DST}/mac-win.elc	444
 _install N ${SFL}/news.el	${DST}/news.el	444
+_install N ${SFL}/ns-win.el.gz	${DST}/ns-win.el.gz	444
+_install N ${SFL}/ns-win.elc	${DST}/ns-win.elc	444
 _install N ${SFL}/pc-win.el.gz	${DST}/pc-win.el.gz	444
 _install N ${SFL}/pc-win.elc	${DST}/pc-win.elc	444
 _install N ${SFL}/rxvt.el.gz	${DST}/rxvt.el.gz	444
 _install N ${SFL}/rxvt.elc	${DST}/rxvt.elc	444
-_install N ${SFL}/sun-mouse.el.gz	${DST}/sun-mouse.el.gz	444
-_install N ${SFL}/sun-mouse.elc	${DST}/sun-mouse.elc	444
 _install N ${SFL}/sun.el.gz	${DST}/sun.el.gz	444
 _install N ${SFL}/sun.elc	${DST}/sun.elc	444
 _install N ${SFL}/sup-mouse.el.gz	${DST}/sup-mouse.el.gz	444
@@ -2699,6 +3303,8 @@
 _install N ${SFL}/vt420.el	${DST}/vt420.el	444
 _install N ${SFL}/w32-win.el.gz	${DST}/w32-win.el.gz	444
 _install N ${SFL}/w32-win.elc	${DST}/w32-win.elc	444
+_install N ${SFL}/w32console.el.gz	${DST}/w32console.el.gz	444
+_install N ${SFL}/w32console.elc	${DST}/w32console.elc	444
 _install N ${SFL}/wyse50.el	${DST}/wyse50.el	444
 _install N ${SFL}/x-win.el.gz	${DST}/x-win.el.gz	444
 _install N ${SFL}/x-win.elc	${DST}/x-win.elc	444
@@ -2706,16 +3312,20 @@
 _install N ${SFL}/xterm.elc	${DST}/xterm.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/textmodes"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/textmodes"
+SFL="usr/share/emacs/23.1/lisp/textmodes"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/textmodes"
 _install N ${SFL}/artist.el.gz	${DST}/artist.el.gz	444
 _install N ${SFL}/artist.elc	${DST}/artist.elc	444
 _install N ${SFL}/bib-mode.el.gz	${DST}/bib-mode.el.gz	444
 _install N ${SFL}/bib-mode.elc	${DST}/bib-mode.elc	444
+_install N ${SFL}/bibtex-style.el.gz	${DST}/bibtex-style.el.gz	444
+_install N ${SFL}/bibtex-style.elc	${DST}/bibtex-style.elc	444
 _install N ${SFL}/bibtex.el.gz	${DST}/bibtex.el.gz	444
 _install N ${SFL}/bibtex.elc	${DST}/bibtex.elc	444
 _install N ${SFL}/conf-mode.el.gz	${DST}/conf-mode.el.gz	444
 _install N ${SFL}/conf-mode.elc	${DST}/conf-mode.elc	444
+_install N ${SFL}/css-mode.el.gz	${DST}/css-mode.el.gz	444
+_install N ${SFL}/css-mode.elc	${DST}/css-mode.elc	444
 _install N ${SFL}/dns-mode.el.gz	${DST}/dns-mode.el.gz	444
 _install N ${SFL}/dns-mode.elc	${DST}/dns-mode.elc	444
 _install N ${SFL}/enriched.el.gz	${DST}/enriched.el.gz	444
@@ -2730,8 +3340,6 @@
 _install N ${SFL}/makeinfo.elc	${DST}/makeinfo.elc	444
 _install N ${SFL}/nroff-mode.el.gz	${DST}/nroff-mode.el.gz	444
 _install N ${SFL}/nroff-mode.elc	${DST}/nroff-mode.elc	444
-_install N ${SFL}/org.el.gz	${DST}/org.el.gz	444
-_install N ${SFL}/org.elc	${DST}/org.elc	444
 _install N ${SFL}/page-ext.el.gz	${DST}/page-ext.el.gz	444
 _install N ${SFL}/page-ext.elc	${DST}/page-ext.elc	444
 _install N ${SFL}/page.el.gz	${DST}/page.el.gz	444
@@ -2770,6 +3378,10 @@
 _install N ${SFL}/reftex-vars.elc	${DST}/reftex-vars.elc	444
 _install N ${SFL}/reftex.el.gz	${DST}/reftex.el.gz	444
 _install N ${SFL}/reftex.elc	${DST}/reftex.elc	444
+_install N ${SFL}/remember.el.gz	${DST}/remember.el.gz	444
+_install N ${SFL}/remember.elc	${DST}/remember.elc	444
+_install N ${SFL}/rst.el.gz	${DST}/rst.el.gz	444
+_install N ${SFL}/rst.elc	${DST}/rst.elc	444
 _install N ${SFL}/sgml-mode.el.gz	${DST}/sgml-mode.el.gz	444
 _install N ${SFL}/sgml-mode.elc	${DST}/sgml-mode.elc	444
 _install N ${SFL}/spell.el.gz	${DST}/spell.el.gz	444
@@ -2794,8 +3406,8 @@
 _install N ${SFL}/underline.elc	${DST}/underline.elc	444
 
 
-SFL="usr/share/emacs/22.1/lisp/url"
-DST="${ROOT}/usr/share/emacs/22.1/lisp/url"
+SFL="usr/share/emacs/23.1/lisp/url"
+DST="${ROOT}/usr/share/emacs/23.1/lisp/url"
 _install N ${SFL}/url-about.el.gz	${DST}/url-about.el.gz	444
 _install N ${SFL}/url-about.elc	${DST}/url-about.elc	444
 _install N ${SFL}/url-auth.el.gz	${DST}/url-auth.el.gz	444
@@ -2854,12 +3466,10 @@
 _install N ${SFL}/url-vars.elc	${DST}/url-vars.elc	444
 _install N ${SFL}/url.el.gz	${DST}/url.el.gz	444
 _install N ${SFL}/url.elc	${DST}/url.elc	444
-_install N ${SFL}/vc-dav.el.gz	${DST}/vc-dav.el.gz	444
-_install N ${SFL}/vc-dav.elc	${DST}/vc-dav.elc	444
 
 
-SFL="usr/share/emacs/22.1/site-lisp"
-DST="${ROOT}/usr/share/emacs/22.1/site-lisp"
+SFL="usr/share/emacs/23.1/site-lisp"
+DST="${ROOT}/usr/share/emacs/23.1/site-lisp"
 _install N ${SFL}/subdirs.el	${DST}/subdirs.el	444
 
 
@@ -2868,9 +3478,49 @@
 _install N ${SFL}/subdirs.el	${DST}/subdirs.el	444
 
 
+SFL="usr/share/icons/hicolor/128x128/apps"
+DST="${ROOT}/usr/share/icons/hicolor/128x128/apps"
+_install N ${SFL}/emacs.png	${DST}/emacs.png	444
+
+
+SFL="usr/share/icons/hicolor/16x16/apps"
+DST="${ROOT}/usr/share/icons/hicolor/16x16/apps"
+_install N ${SFL}/emacs.png	${DST}/emacs.png	444
+_install N ${SFL}/emacs22.png	${DST}/emacs22.png	444
+
+
+SFL="usr/share/icons/hicolor/24x24/apps"
+DST="${ROOT}/usr/share/icons/hicolor/24x24/apps"
+_install N ${SFL}/emacs.png	${DST}/emacs.png	444
+_install N ${SFL}/emacs22.png	${DST}/emacs22.png	444
+
+
+SFL="usr/share/icons/hicolor/32x32/apps"
+DST="${ROOT}/usr/share/icons/hicolor/32x32/apps"
+_install N ${SFL}/emacs.png	${DST}/emacs.png	444
+_install N ${SFL}/emacs22.png	${DST}/emacs22.png	444
+
+
+SFL="usr/share/icons/hicolor/48x48/apps"
+DST="${ROOT}/usr/share/icons/hicolor/48x48/apps"
+_install N ${SFL}/emacs.png	${DST}/emacs.png	444
+_install N ${SFL}/emacs22.png	${DST}/emacs22.png	444
+
+
+SFL="usr/share/icons/hicolor/scalable/apps"
+DST="${ROOT}/usr/share/icons/hicolor/scalable/apps"
+_install N ${SFL}/emacs.svg	${DST}/emacs.svg	444
+
+
+SFL="usr/share/icons/hicolor/scalable/mimetypes"
+DST="${ROOT}/usr/share/icons/hicolor/scalable/mimetypes"
+_install N ${SFL}/emacs-document.svg	${DST}/emacs-document.svg	444
+
+
 SFL="usr/share/info"
 DST="${ROOT}/usr/share/info"
 _install N ${SFL}/ada-mode	${DST}/ada-mode	444
+_install N ${SFL}/auth	${DST}/auth	444
 _install N ${SFL}/autotype	${DST}/autotype	444
 _install N ${SFL}/calc	${DST}/calc	444
 _install N ${SFL}/calc-1	${DST}/calc-1	444
@@ -2881,7 +3531,9 @@
 _install N ${SFL}/calc-6	${DST}/calc-6	444
 _install N ${SFL}/ccmode	${DST}/ccmode	444
 _install N ${SFL}/ccmode-1	${DST}/ccmode-1	444
+_install N ${SFL}/ccmode-2	${DST}/ccmode-2	444
 _install N ${SFL}/cl	${DST}/cl	444
+_install N ${SFL}/dbus	${DST}/dbus	444
 _install N ${SFL}/dired-x	${DST}/dired-x	444
 _install N ${SFL}/ebrowse	${DST}/ebrowse	444
 _install N ${SFL}/ediff	${DST}/ediff	444
@@ -2893,6 +3545,7 @@
 _install N ${SFL}/elisp	${DST}/elisp	444
 _install N ${SFL}/elisp-1	${DST}/elisp-1	444
 _install N ${SFL}/elisp-10	${DST}/elisp-10	444
+_install N ${SFL}/elisp-11	${DST}/elisp-11	444
 _install N ${SFL}/elisp-2	${DST}/elisp-2	444
 _install N ${SFL}/elisp-3	${DST}/elisp-3	444
 _install N ${SFL}/elisp-4	${DST}/elisp-4	444
@@ -2911,6 +3564,7 @@
 _install N ${SFL}/emacs-7	${DST}/emacs-7	444
 _install N ${SFL}/emacs-8	${DST}/emacs-8	444
 _install N ${SFL}/emacs-mime	${DST}/emacs-mime	444
+_install N ${SFL}/epa	${DST}/epa	444
 _install N ${SFL}/erc	${DST}/erc	444
 _install N ${SFL}/eshell	${DST}/eshell	444
 _install N ${SFL}/eudc	${DST}/eudc	444
@@ -2924,11 +3578,13 @@
 _install N ${SFL}/gnus-5	${DST}/gnus-5	444
 _install N ${SFL}/idlwave	${DST}/idlwave	444
 _install N ${SFL}/info	${DST}/info	444
+_install N ${SFL}/mairix-el	${DST}/mairix-el	444
 _install N ${SFL}/message	${DST}/message	444
 _install N ${SFL}/mh-e	${DST}/mh-e	444
 _install N ${SFL}/mh-e-1	${DST}/mh-e-1	444
 _install N ${SFL}/mh-e-2	${DST}/mh-e-2	444
 _install N ${SFL}/newsticker	${DST}/newsticker	444
+_install N ${SFL}/nxml-mode	${DST}/nxml-mode	444
 _install N ${SFL}/org	${DST}/org	444
 _install N ${SFL}/org-1	${DST}/org-1	444
 _install N ${SFL}/org-2	${DST}/org-2	444
@@ -2936,6 +3592,8 @@
 _install N ${SFL}/pgg	${DST}/pgg	444
 _install N ${SFL}/rcirc	${DST}/rcirc	444
 _install N ${SFL}/reftex	${DST}/reftex	444
+_install N ${SFL}/remember	${DST}/remember	444
+_install N ${SFL}/sasl	${DST}/sasl	444
 _install N ${SFL}/sc	${DST}/sc	444
 _install N ${SFL}/ses	${DST}/ses	444
 _install N ${SFL}/sieve	${DST}/sieve	444
@@ -2949,34 +3607,16 @@
 _install N ${SFL}/woman	${DST}/woman	444
 
 
-SFL="usr/share/man"
-DST="${ROOT}/usr/share/man"
-
-
 SFL="usr/share/man/man1"
 DST="${ROOT}/usr/share/man/man1"
 _install N ${SFL}/b2m.1	${DST}/b2m.1	444
 _install N ${SFL}/ebrowse.1	${DST}/ebrowse.1	444
-_install N ${SFL}/emacs.1	${DST}/emacs.1	444
 _install N ${SFL}/emacs-gtk.1	${DST}/emacs-gtk.1	444
 _install N ${SFL}/emacs-nox.1	${DST}/emacs-nox.1	444
 _install N ${SFL}/emacs-x.1	${DST}/emacs-x.1	444
+_install N ${SFL}/emacs.1	${DST}/emacs.1	444
 _install N ${SFL}/emacsclient.1	${DST}/emacsclient.1	444
 _install N ${SFL}/grep-changelog.1	${DST}/grep-changelog.1	444
 _install N ${SFL}/rcs-checkin.1	${DST}/rcs-checkin.1	444
 
-
-SFL="usr/gnu/share"
-DST="${ROOT}/usr/gnu/share"
-
-
-SFL="usr/gnu/share/man"
-DST="${ROOT}/usr/gnu/share/man"
-
-
-SFL="usr/gnu/share/man/man1"
-DST="${ROOT}/usr/gnu/share/man/man1"
-_install N ${SFL}/ctags.1	${DST}/ctags.1	444
-_install N ${SFL}/etags.1	${DST}/etags.1	444
-
 exit 0
--- a/usr/src/cmd/emacs/tools/build_emacs	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/emacs/tools/build_emacs	Sun Dec 20 07:12:51 2009 +0200
@@ -20,10 +20,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)build_emacs	1.1	08/09/16 SMI"
+# ident	"@(#)build_emacs	1.2	09/10/29 SMI"
 
 
 # Build GNU emacs for the Solaris SFW consolidation:
@@ -45,7 +45,7 @@
 # because the series of steps involved in a build is rather complex,
 # and it occurs in the Makefile multiple times.
 
-VER=emacs-22.1
+VER=emacs-23.1
 
 
 case $1 in
@@ -55,11 +55,10 @@
 esac
 
 case $2 in
-lucid)	TOOLKIT_OPT='--with-toolkit-scroll-bars';;
+lucid)	TOOLKIT_OPT='--with-x-toolkit=lucid --with-gif=no';;
 nox)	TOOLKIT_OPT='--without-x';;
-#gtk)	TOOLKIT_OPT='--with-gtk --with-toolkit-scroll-bars';;
-gtk)	TOOLKIT_OPT='--with-gtk';;
-*)	echo "build_emacs: unknown variant '$2'. Must be lucid, nox, or sfw" >&2;
+gtk)	TOOLKIT_OPT='--with-x-toolkit=gtk --with-gif=no';;
+*)	echo "build_emacs: unknown variant '$2'. Must be lucid, nox, or gtk" >&2;
 	exit 1;;
 esac
 
@@ -76,11 +75,9 @@
 # apply our patches.
 if [ ! -d $VER ]; then
 	/usr/bin/gzip -dc ${VER}.tar.gz | /usr/sfw/bin/gtar xpf -
-	/usr/bin/gpatch -p0 < augment/patch/config.guess.patch
-	/usr/bin/gpatch -p0 < augment/patch/configure.patch
+	/usr/bin/gpatch -p0 < augment/patch/buffer_menu.patch
 	/usr/bin/gpatch -p0 < augment/patch/sysmalloc.patch
 	/usr/bin/gpatch -p0 < augment/patch/dldump.patch
-	/usr/bin/gpatch -p0 < augment/patch/gtkutil.patch
 
 
 	# The GPL license under which emacs is published is
@@ -90,16 +87,16 @@
 	# in those cases where the license offers a choice.
 	for F in `find . -name COPYING`; do
 		mv $F $F.orig
-		(echo "For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
+		(echo "For the avoidance of doubt, except that if any license choice other than GPL or
+LGPL is available it will apply instead, Sun elects to use only the General
+Public License version 3 (GPLv3) at this time for any software where a choice of
+GPL license versions is made available with the language indicating that GPLv3
+or any later version may be used, or where a choice of which version of the GPL
 is applied is otherwise unspecified.
 ====================================================================
 
 "; cat $F.orig) > $F
+	rm $F.orig
 	done
 fi
 
--- a/usr/src/cmd/mutt/Makefile.sfw	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/mutt/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -24,7 +24,7 @@
 # Use is subject to license terms.
 #
 
-#ident	"@(#)Makefile.sfw	1.7	09/10/20 SMI"
+#ident	"@(#)Makefile.sfw	1.8	09/11/03 SMI"
 
 include ../Makefile.cmd
 
@@ -85,6 +85,8 @@
 CONFIGURE_OPTIONS += --with-slang=$(ROOT)/usr
 CONFIGURE_OPTIONS += --with-ssl
 CONFIGURE_OPTIONS += --with-wc-funcs
+CONFIGURE_OPTIONS += MKDIR_P="/usr/gnu/bin/mkdir -p"
+CONFIGURE_OPTIONS += AWK="/usr/bin/gawk"
 
 # Optimization level
 sparc_COPTFLAG = -xO4
--- a/usr/src/cmd/php5/METADATA	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/php5/METADATA	Sun Dec 20 07:12:51 2009 +0200
@@ -14,6 +14,7 @@
         Patch to build with apache 2.2 bundled within SFW
         Patch to install pear in /var/php/5.2/pear
         Patch to build IMAP extension using SFW's CC compiler
+        Patch to allow PHP Zlib extension work with Zlib library.
 	ADDITIONS:
         Deliver APC/Memcache statistics and its associated Apache configuration file
         Provide hookup script to integrate with Sun Web Server
--- a/usr/src/cmd/php5/Makefile.sfw	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/php5/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)Makefile.sfw	1.27	09/09/30 SMI"
+#pragma ident	"@(#)Makefile.sfw	1.28	09/10/29 SMI"
 
 PHP_REL=5.2
 #
@@ -109,7 +109,7 @@
 	LD="$(CCC) -norunpath" \
 	CPPFLAGS="-I../CPPFLAGSTEST -D_POSIX_PTHREAD_SEMANTICS" \
 	CFLAGS="$(CFLAGS) $(PHP_LFS) $(PHP_CFLAGS) $(PHP_CFLAGS_$(MACH))" \
-	LDFLAGS="-L$(ROOT)/usr/postgres/8.3/lib -L$(ROOT)$(MYSQL_LIBDIR)" \
+	LDFLAGS="-L$(ROOT)/usr/postgres/8.3/lib -L$(ROOT)$(MYSQL_LIBDIR) -lrt" \
 	LIBS="-lsocket -lnsl -ldl -lposix4" \
 	EXTENSION_DIR=/usr/php/$(PHP_REL)/modules \
 	PHP_PEAR_CACHE_DIR=/var/tmp/pear/cache \
@@ -173,9 +173,6 @@
 #
 #	--with-pdo-odbc                 W,unixODBC      -       DEP.9
 #
-#	--with-snmp                     W               -       DEP.11
-#	--enable-ucd-snmp-hack
-#
 #	--with-unixODBC
 
 build_imap: $(IMAP_CLIENT_DIR)/libc-client.a
@@ -309,6 +306,7 @@
 		--with-pdo-pgsql=shared,$(ROOT)/usr/postgres/8.3 \
 		--with-pdo-sqlite=shared \
 		--with-pgsql=shared,$(ROOT)/usr/postgres/8.3 \
+		--with-snmp=shared,$(ROOT)/usr \
 		--with-sqlite=shared \
 		--with-tidy=shared,$(ROOT)/usr \
 		--with-zlib=shared \
@@ -327,6 +325,7 @@
 
 $(PHP_DIR)/configure: $(PHP_DIR).tar.bz2
 	bunzip2 -dc $(PHP_DIR).tar.bz2 | tar xopf -
+	(cp /usr/include/zlib.h $(PHP_DIR)/ext/zlib/my_zlib.h)
 	# avoid running apxs with -a option when installing mod_php
 	# because we move libphp later
 	(cd $(PHP_DIR) && \
@@ -334,6 +333,8 @@
 		gpatch -p1 -i ../patches/php_dtrace.patch && \
 		gpatch -p1 -i ../patches/php_Makefile.global.patch && \
 		gpatch -p1 -i ../patches/php_dl.c.patch && \
+		gpatch -p1 -i ../patches/php_6818228.patch && \
+		gpatch -p1 -i ../patches/php_6825797.patch && \
 		gpatch -p1 -i ../patches/php_run-tests.php.patch)
 	(cd $(PHP_DIR); env - $(PRECONF_ENVLINE) \
 	    ./buildconf --force )
--- a/usr/src/cmd/php5/config/extensions/xdebug.ini	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/php5/config/extensions/xdebug.ini	Sun Dec 20 07:12:51 2009 +0200
@@ -23,7 +23,7 @@
 ; Use is subject to license terms.
 ;
 ;Uncomment next line to enable xdebug extension in php
-;extension=xdebug.so
+;zend_extension=/usr/php/5.2/modules/xdebug.so
 
 ;Uncomment below configuration directives to enable 
 ;debugging with IDE's like Netbeans, Eclipse.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/php5/patches/php_6818228.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,51 @@
+--- php-5.2.11/ext/zlib/my_zlib.h	Thu Jan 25 04:13:36 2007
++++ php-5.2.11/ext/zlib/my_zlib.h	Tue Oct 20 13:55:01 2009
+@@ -1180,8 +1180,8 @@
+    degrade compression.
+ */
+ 
+-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
+-                                      z_off_t offset, int whence));
++ZEXTERN uLong ZEXPORT      gzseek OF((gzFile file,
++                                      uLong offset, int whence));
+ /*
+       Sets the starting position for the next gzread or gzwrite on the
+    given compressed file. The offset represents a number of bytes in the
+@@ -1205,7 +1205,7 @@
+    gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+ */
+ 
+-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
++ZEXTERN uLong   ZEXPORT    gztell OF((gzFile file));
+ /*
+      Returns the starting position for the next gzread or gzwrite on the
+    given compressed file. This position represents a number of bytes in the
+@@ -1274,7 +1274,7 @@
+ */
+ 
+ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+-                                          z_off_t len2));
++                                          uLong len2));
+ /*
+      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
+    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+@@ -1298,7 +1298,7 @@
+      if (crc != original_crc) error();
+ */
+ 
+-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
++ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, uLong len2));
+ 
+ /*
+      Combine two CRC-32 check values into one.  For two sequences of bytes,
+--- php-5.2.11/ext/zlib/php_zlib.h.ORIG	Tue Oct 20 13:56:27 2009
++++ php-5.2.11/ext/zlib/php_zlib.h	Tue Oct 20 13:56:38 2009
+@@ -22,7 +22,7 @@
+ #ifndef PHP_ZLIB_H
+ #define PHP_ZLIB_H
+ 
+-#include <zlib.h>
++#include "my_zlib.h"
+ 
+ ZEND_BEGIN_MODULE_GLOBALS(zlib)
+ 	/* variables for transparent gzip encoding */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/php5/patches/php_6825797.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,25 @@
+--- php-5.2.11/ext/gettext/gettext.c.ORIG	Fri Oct 30 12:30:53 2009
++++ php-5.2.11/ext/gettext/gettext.c	Fri Oct 30 12:43:56 2009
+@@ -126,6 +126,7 @@
+ /* }}} */
+ 
+ #include <libintl.h>
++#include <locale.h>
+ 
+ zend_module_entry php_gettext_module_entry = {
+ 	STANDARD_MODULE_HEADER,
+@@ -353,7 +354,13 @@
+ 	PHP_GETTEXT_LENGTH_CHECK("msgid1", msgid1_len)
+ 	PHP_GETTEXT_LENGTH_CHECK("msgid2", msgid2_len)
+ 
+-	msgstr = dcngettext(domain, msgid1, msgid2, count, category);
++	if (category > LC_ALL || category < 0) {
++		/* if we pass higher value than LC_ALL glibc uses LC_ALL.
++		If not set, this can lead to segfaults on non-gnu systems */
++		msgstr = dngettext(domain, msgid1, msgid2, count);
++	} else {
++		msgstr = dcngettext(domain, msgid1, msgid2, count, category);
++	}
+ 
+ 	if (msgstr) {
+ 		RETVAL_STRING(msgstr, 1);
--- a/usr/src/cmd/sox/Makefile.sfw	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/sox/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -23,7 +23,7 @@
 # Use is subject to license terms.
 #
 
-#ident	"@(#)Makefile.sfw	1.1	09/08/28 SMI"
+#ident	"@(#)Makefile.sfw	1.2	09/10/28 SMI"
 
 VER =           $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
 VER64=$(VER)-64
@@ -64,7 +64,8 @@
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(CCSMAKE) \
 	./configure --prefix=/usr \
-	--disable-static)
+	--disable-static \
+	--disable-gomp)
 
 $(VER64)/config.status: $(VER64)/configure
 	(cd $(VER64); env - \
@@ -77,7 +78,8 @@
             MAKE=$(CCSMAKE) \
             ./configure --prefix=/usr \
 	    --libdir=/usr/lib/$(MACH64) \
-            --disable-static)
+            --disable-static \
+	    --disable-gomp)
 
 $(VER)/configure: $(VER).tar.gz
 	$(GTAR) zxpf $(VER).tar.gz --no-same-owner
--- a/usr/src/cmd/subversion/METADATA	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/subversion/METADATA	Sun Dec 20 07:12:51 2009 +0200
@@ -1,10 +1,10 @@
 NAME:             subversion
-VERSION:          1.4.3
+VERSION:          1.6.5
 DESCRIPTION:      open source version control system
 LICENSE:          Subversion
-PACKAGE:          SUNWsvn
+PACKAGE:          SUNWsvn SUNWsvn-java SUNWsvn-perl SUNWsvn-python
 PROJECT_URL:      http://subversion.tigris.org/
-SOURCE_DOWNLOAD:  http://subversion.tigris.org/downloads/subversion-1.4.3.tar.gz
+SOURCE_DOWNLOAD:  http://subversion.tigris.org/downloads/subversion-1.6.5.tar.gz
 SUPPORT:          Managed
 BUGTRAQ:          solaris/utility/svn
 OSR:              4495
--- a/usr/src/cmd/subversion/Makefile.sfw	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/subversion/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -22,47 +22,138 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.sfw	1.15	09/09/21 SMI"
+# ident	"@(#)Makefile.sfw	1.16	09/10/21 SMI"
 
-VER=subversion-1.4.3
+VER=subversion-1.6.5
+VERPY26=subversion-1.6.5-py26
 SVN_PACKAGES=SUNWsvn SUNWsvn-java SUNWsvn-perl SUNWsvn-python
 SWIGPROG=$(ROOT)/usr/bin/swig
 PERL=/usr/perl5/bin/perl
-UCBINSTALL=/usr/ucb/install
-SVN_LDFLAGS="-R/usr/lib/svn:$(APR_USR_PREFIX)/lib:$(APR_UTIL_USR_PREFIX)/lib:/usr/sfw/lib \
+GSED=/usr/bin/gsed
+TOP = $(SRC)/cmd/subversion
+DESTDIR = $(TOP)/proto-$(MACH)
+
+SVN_LDFLAGS=-R/usr/lib/svn:$(APR_USR_PREFIX)/lib:$(APR_UTIL_USR_PREFIX)/lib \
     -L$(ROOT)$(APR_USR_PREFIX)/lib \
     -L$(ROOT)$(APR_UTIL_USR_PREFIX)/lib \
-    -L$(ROOT)/usr/sfw/lib \
     -L$(ROOT)/usr/lib \
-    -M $(SRC)/cmd/mapfile_noexstk"
+    -M $(SRC)/cmd/mapfile_noexstk \
+    -lsocket -lresolv -lnsl -lgen -z ignore
 
 include ../Makefile.cmd
 include $(SRC)/cmd/apache2/apache.build.env
 include $(SRC)/cmd/apr/apr-1.3/apr.build.env
 include $(SRC)/cmd/apr-util/apr-util-1.3/apr-util.build.env
 
-all: $(VER)/config.status
+PREFIX=/usr
+PICFLAG = -KPIC -DPIC
+COMPAT_VERSION=5
+CFLAGS_GENERIC = -Xc -xc99=%all -features=extinl,extensions -xprefetch=auto
+CFLAGS_GENERIC += -xbuiltin=%none -xnorunpath -xcsi -xinline=%auto
+CFLAGS_GENERIC += -xustr=ascii_utf16_ushort -xF=%none -xthreadvar=%all
+CFLAGS_GENERIC += -xspace -xldscope=symbolic -KPIC -mt -D_REENTRANT
+CFLAGS_GENERIC += -D__EXTENSIONS__=1 -D_LARGEFILE_SOURCE
+CFLAGS_GENERIC += -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=600 -D_XPG6
+CFLAGS_GENERIC += -D_POSIX_PTHREAD_SEMANTICS -D_POSIX_C_SOURCE=200112L
+CFLAGS_GENERIC += -D__XOPEN_OR_POSIX -D_STRICT_STDC -D_STRICT_STDC__
+CFLAGS_GENERIC += -D_STDC_C99 -D_ISOC99_SOURCE -D__C99FEATURES__ -DSOLARIS
+
+CFLAGS_i386 = -m32 -xregs=no%frameptr -xarch=generic -xO3 -s
+CFLAGS_sparc = -m32 -xmemalign=8i
+CFLAGS_sparc += -xtarget=ultra2 -xarch=sparcvis -xchip=ultra2 -xO4 -s
+CFLAGS = $(CFLAGS_GENERIC) $(CFLAGS_$(MACH))
+
+CXXFLAGS_sparc = -xtarget=ultra2 -xarch=sparcvis -xchip=ultra2 
+CXXFLAGS_sparc += -xbuiltin=%none -xmemalign=8i $(PICFLAG) -xO4 -s
+CXXFLAGS_i386 = -xregs=no%frameptr -xO3 -s -xbuiltin=%none $(PICFLAG)
+
+CCFLAGS_GENERIC = -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic
+CCFLAGS_GENERIC += -instances=global
+CCFLAGS_GENERIC += -template=geninlinefuncs
+CCFLAGS_GENERIC += -verbose=template
+CCFLAGS_GENERIC += $(CXXFLAGS_$(MACH))
+CCFLAGS_GENERIC += -xlang=c99
+CCFLAGS_GENERIC += -xbuiltin=%none
+CCFLAGS_GENERIC += -xinline=
+CCFLAGS_GENERIC += -xspace
+CCFLAGS_GENERIC += -xustr=ascii_utf16_ushort
+CCFLAGS_GENERIC += -norunpath
+CCFLAGS_GENERIC += -z ignore $(PICFLAG)
+CCFLAGS_GENERIC += -mt -D_REENTRANT -DNDEBUG
+CCFLAGS_GENERIC += -D__EXTENSIONS__
+CCFLAGS_GENERIC += -D_LARGEFILE_SOURCE
+CCFLAGS_GENERIC += -D_FILE_OFFSET_BITS=64
+CCFLAGS_GENERIC += -D_XOPEN_SOURCE=500
+CCFLAGS_GENERIC += -D_XPG5
+CCFLAGS_GENERIC += -D_POSIX_PTHREAD_SEMANTICS -s
+CCFLAGS = $(CCFLAGS_GENERIC) $(CXXFLAGS_$(MACH))
+
+CPPFLAGS = -I$(ROOT)/usr/include/neon -I$(ROOT)/usr/include
+
+LDFLAGS = -L$(ROOT)/usr/lib -L/usr/lib -R/usr/lib
+LDFLAGS += -m32 -s -z ignore
+
+PYVER24=2.4
+PYVER26=2.6
+PYTHON24=/usr/bin/python$(PYVER24)
+PYTHON26=/usr/bin/python$(PYVER26)
+PYDIR24=$(ROOTLIB)/python$(PYVER24)
+PYDIR26=$(ROOTLIB)/python$(PYVER26)
+PYVENDORDIR24=$(PYDIR24)/vendor-packages
+PYVENDORDIR26=$(PYDIR26)/vendor-packages
+PYMODS=client core delta fs ra repos wc
+
+all: $(VER)/config.status $(VERPY26)/config.status
 	$(INCREFIXUP) $(VER)
-	(cd $(VER); env \
-	    LDFLAGS=$(SVN_LDFLAGS) \
-	    LD_OPTIONS=$(SVN_LDFLAGS) \
-	    SWIG_LDFLAGS=$(SVN_LDFLAGS) \
+	$(INCREFIXUP) $(VERPY26)
+	( cd $(VER) ; \
+	    $(GSED) -e "s#-I/usr/include/neon#-I$(ROOT)/usr/include/neon#g" Makefile > Makefile.sed ; \
+	    cp -fp Makefile.sed Makefile ; \
+	    touch -acm Makefile ; \
+	    rm -f Makefile.sed )
+	( cd $(VERPY26) ; \
+	    $(GSED) -e "s#-I/usr/include/neon#-I$(ROOT)/usr/include/neon#g" Makefile > Makefile.sed ; \
+	    cp -fp Makefile.sed Makefile ; \
+	    touch -acm Makefile ; \
+	    rm -f Makefile.sed )
+	( cd $(VER) ; env - \
+	    "PYVER=$(PYVER24)" \
+	    "PYTHON=$(PYTHON24)" \
+	    "PYDIR=$(PYDIR24)" \
+	    "PYVENDORDIR=$(PYVENDORDIR24)" \
+	    "PYMODS=$(PYMODS)" \
+	    "LDFLAGS=$(LDFLAGS) $(SVN_LDFLAGS)" \
+	    "LD_OPTIONS=$(LDFLAGS) $(SVN_LDFLAGS)" \
+	    "SWIG_LDFLAGS=$(LDFLAGS) $(SVN_LDFLAGS)" \
 	    CC=$(CC) CXX=$(CCC) \
+	    "CPPFLAGS=$(CPPFLAGS)" \
 	    "CFLAGS=$(CFLAGS)" \
-	    NEON_LIBS="-lneon" \
-	    MAKE=$(CCSMAKE) \
+	    "CXXFLAGS=$(CCFLAGS)" \
+	    NEON_LIBS="-L$(ROOT)/usr/lib -lneon" \
+	    MAKE=$(GMAKE) \
 	    PATH=$(SFW_PATH) \
-	    $(CCSMAKE) -e all swig-py swig-pl javahl)
+	    INSTALL=$(GINSTALL) \
+	    $(GMAKE) all swig-py swig-pl javahl )
+	( cd $(VERPY26) ; env - \
+	    "PYVER=$(PYVER26)" \
+	    "PYTHON=$(PYTHON26)" \
+	    "PYDIR=$(PYDIR26)" \
+	    "PYVENDORDIR=$(PYVENDORDIR26)" \
+	    "PYMODS=$(PYMODS)" \
+	    "LDFLAGS=$(LDFLAGS) $(SVN_LDFLAGS)" \
+	    "LD_OPTIONS=$(LDFLAGS) $(SVN_LDFLAGS)" \
+	    "SWIG_LDFLAGS=$(LDFLAGS) $(SVN_LDFLAGS)" \
+	    CC=$(CC) CXX=$(CCC) \
+	    "CPPFLAGS=$(CPPFLAGS)" \
+	    "CFLAGS=$(CFLAGS)" \
+	    "CXXFLAGS=$(CCFLAGS)" \
+	    NEON_LIBS="-L$(ROOT)/usr/lib -lneon" \
+	    MAKE=$(GMAKE) \
+	    PATH=$(SFW_PATH) \
+	    INSTALL=$(GINSTALL) \
+	    $(GMAKE) all swig-py )
 	@find . -name core -exec rm -f {} \;
 
-
-ROOTSVNLIB=$(ROOTLIB)/svn
-ROOTSVNINCLUDE=$(ROOT)/usr/include/svn
-ROOTSHAREMAN=$(ROOT)/usr/share/man
-ROOTSHARELIB=$(ROOT)/usr/share/lib
-ROOTSHARELOCALE=$(ROOT)/usr/share/locale
-ROOTAPACHELIBEXEC=$(ROOT)$(APACHE_USR_PREFIX)/libexec
-
 _ARCH:sh=arch
 PLARCH=$(_ARCH)-solaris-64int
 PLVER=5.8.4
@@ -71,87 +162,51 @@
 PLVENDORARCHDIR=$(PLVENDORDIR)/$(PLARCH)
 PLMODS= Fs Core Wc Client Repos Ra Delta
 
-PYTHON=/usr/bin/python
-PYVER=2.4
-PYDIR=$(ROOTLIB)/python$(PYVER)
-PYVENDORDIR=$(PYDIR)/vendor-packages
-PYMODS=client core delta fs ra repos wc
-
-SVNLIBS=client delta diff fs fs_fs ra ra_dav ra_local ra_svn repos subr wc
-SVNCMDS=svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion
-SVNLOCALES=de es fr it ja ko nb pl pt_BR sv zh_CN zh_TW
-SVNAPACHEMODS=authz dav
-SVNINCS=mod_dav_svn.h svn_diff.h svn_opt.h svn_string.h \
-	svn_auth.h svn_dso.h svn_path.h svn_subst.h \
-	svn_base64.h svn_error.h svn_pools.h svn_time.h \
-	svn_client.h svn_error_codes.h svn_props.h svn_types.h \
-	svn_cmdline.h svn_fs.h svn_quoprint.h svn_user.h \
-	svn_config.h svn_hash.h svn_ra.h svn_utf.h \
-	svn_ctype.h svn_io.h svn_ra_svn.h svn_version.h \
-	svn_dav.h svn_md5.h svn_repos.h svn_wc.h \
-	svn_delta.h svn_nls.h svn_sorts.h svn_xml.h
-
-SVNMAN1=svn svnadmin svndumpfilter svnlook svnsync svnversion
-SVNMAN5=svnserve.conf
-SVNMAN8=svnserve
-
-ROOTSVNLIBS=$(SVNLIBS:%=$(ROOTSVNLIB)/libsvn_%-1.so.0.0.0)
-ROOTSVNLALIBS=$(SVNLIBS:%=$(ROOTSVNLIB)/libsvn_%-1.la)
-
-ROOTSVNINCS=$(SVNINCS:%=$(ROOTSVNINCLUDE)/%)
-
-ROOTSVNMANFILES=$(SVNMAN1:%=$(ROOTSHAREMAN)/man1/%.1) \
-	$(SVNMAN5:%=$(ROOTSHAREMAN)/man5/%.5) \
-	$(SVNMAN8:%=$(ROOTSHAREMAN)/man8/%.8)
-
-ROOTSVNPYLAMODS=$(PYMODS:%=$(PYVENDORDIR)/libsvn/_%.la)
-ROOTSVNPYSOMODS=$(PYMODS:%=$(PYVENDORDIR)/libsvn/_%.so)
-ROOTSVNPLSOMODS=$(PLMODS:%=$(PLVENDORARCHDIR)/auto/SVN/_%/_%.so)
-
-ROOTSVNCMDS=$(SVNCMDS:%=$(ROOTBIN)/%)
+install: install_svn
+	INSTDIR=$(DESTDIR) TOP=$(TOP) $(SH) ./install-sfw
+	for pkg in $(SVN_PACKAGES) ; do \
+	    $(SRC)/tools/protofix --pkg $$pkg --perm ; \
+	done
 
-ROOTPYLIBS=$(ROOTSVNLIB)/libsvn_swig_py-1.so.0.0.0
-ROOTPLLIBS=$(ROOTSVNLIB)/libsvn_swig_perl-1.so.0.0.0
-ROOTJAVALIBS=$(ROOTSVNLIB)/libsvnjavahl-1.so.0.0.0
-ROOTPYLALIBS=$(ROOTSVNLIB)/libsvn_swig_py-1.la
-ROOTPLLALIBS=$(ROOTSVNLIB)/libsvn_swig_perl-1.la
-ROOTJAVALALIBS=$(ROOTSVNLIB)/libsvnjavahl-1.la
-
-ROOTSVNJAVAJAR=$(ROOTSHARELIB)/java/svn-javahl.jar
-
-ROOTSVNLOCALES=$(SVNLOCALES:%=$(ROOTSHARELOCALE)/%/LC_MESSAGES/subversion.mo)
-
-ROOTAPACHEMODS=$(SVNAPACHEMODS:%=$(ROOTAPACHELIBEXEC)/mod_%_svn.so)
-
-$(ROOTSVNMANFILES) := FILEMODE= 0444
-$(ROOTSVNLOCALES) := FILEMODE= 0644
-$(ROOTSVNINCS) := FILEMODE= 0644
-$(ROOTSVNJAVAJAR) := FILEMODE= 0644
-
-install: all .WAIT $(ROOTSVNMANFILES) $(ROOTSVNJAVAJAR) $(ROOTSVNLOCALES) \
-	install_perl $(ROOTSVNINCS) .WAIT install_postproc
-
-.distinst-stamp:
-	-rm -f $(ROOTAPACHEMODS) # install-mods-shared can't overwrite
-	(cd $(VER) ; env "DESTDIR=$(ROOT)" $(CCSMAKE) install-lib \
+install_svn: all .WAIT install_perl
+	mkdir -p $(DESTDIR)
+	( cd $(VER) ; \
+	    env - "DESTDIR=$(DESTDIR)" \
+	    "INSTALL=$(GINSTALL)" \
+	    "MAKE=$(GMAKE)" \
+	    "PYVER=$(PYVER24)" \
+	    "PYTHON=$(PYTHON24)" \
+	    "PYDIR=$(PYDIR24)" \
+	    "PYVENDORDIR=$(PYVENDORDIR24)" \
+	    "PYMODS=$(PYMODS)" \
+	    $(GMAKE) DESTDIR=$(DESTDIR) \
+	    INSTALL=$(GINSTALL) install install-lib \
 	    install-swig-pl-lib install-swig-py install-javahl-lib \
-	    install-bin)  
-	(cd $(VER) ; $(CCSMAKE) install-mods-shared) 
-	touch .distinst-stamp
-
-install_postproc: .distinst-stamp
-	for pkg in $(SVN_PACKAGES) ; do \
-		$(SRC)/tools/protofix --pkg $$pkg --write ; \
-	done
-	$(SRC)/tools/post_process $(ROOTSVNCMDS)
-	$(SRC)/tools/post_process_so $(ROOTSVNLIBS) $(ROOTPYLIBS) \
-	  $(ROOTJAVALIBS) $(ROOTPLLIBS) $(ROOTAPACHEMODS) \
-	  $(ROOTSVNPYSOMODS) $(ROOTSVNPLSOMODS)
-	rm -rf $(ROOTSVNLALIBS) $(ROOTPYLALIBS) $(ROOTPLLALIBS) \
-	  $(ROOTJAVALALIBS) $(ROOTSVNPYLAMODS)
-	for pkg in $(SVN_PACKAGES) ; do \
-		$(SRC)/tools/protofix --pkg $$pkg --perm ; \
-	done
+	    install-bin install-docs )
+	( cd $(VERPY26) ; \
+	    env - "DESTDIR=$(DESTDIR)" \
+	    "INSTALL=$(GINSTALL)" \
+	    "MAKE=$(GMAKE)" \
+	    "PYVER=$(PYVER26)" \
+	    "PYTHON=$(PYTHON26)" \
+	    "PYDIR=$(PYDIR26)" \
+	    "PYVENDORDIR=$(PYVENDORDIR26)" \
+	    "PYMODS=$(PYMODS)" \
+	    $(GMAKE) DESTDIR=$(DESTDIR) \
+	    INSTALL=$(GINSTALL) install-swig-py )
+	( cd $(VER) ; \
+	    env - "DESTDIR=$(DESTDIR)" \
+	    "INSTALL=$(GINSTALL)" \
+	    "MAKE=$(GMAKE)" \
+	    $(GMAKE) DESTDIR=$(DESTDIR) \
+	    INSTALL=$(GINSTALL) install-javahl )
+	( cd $(VER) ; \
+	    rm -f $(ROOTAPACHEMODS) ; \
+	    env - "DESTDIR=$(DESTDIR)" \
+	    "INSTALL=$(GINSTALL)" \
+	    "MAKE=$(GMAKE)" \
+	    $(GMAKE) DESTDIR=$(DESTDIR) \
+	    INSTALL=$(GINSTALL) install-mods-shared )
 
 install_perl:
 	$(PERL) -MExtUtils::Install -e \
@@ -160,56 +215,114 @@
 	  $(VER)/subversion/bindings/swig/perl/native/blib/arch $(PLVENDORDIR)/$(PLARCH) \
 	  $(VER)/subversion/bindings/swig/perl/native/blib/man3 $(PLDIR)/man/man3
 
-
-$(VER)/subversion/bindings/java/javahl/svn-javahl.jar:
-	$(JAR) cf $@ -C $(VER)/subversion/bindings/java/javahl/classes org
-
-
 $(VER)/config.status: $(VER)/configure
-	(cd $(VER); env \
-	    CC=$(CC) "CXX=$(CCC) -norunpath" \
+	( cd $(VER) ; env - \
+	    "PYVER=$(PYVER24)" \
+	    "PYTHON=$(PYTHON24)" \
+	    "PYDIR=$(PYDIR24)" \
+	    "PYVENDORDIR=$(PYVENDORDIR24)" \
+	    "PYMODS=$(PYMODS)" \
+	    "CC=$(CC)" \
+	    "CXX=$(CCC)" \
+	    "CPPFLAGS=$(CPPFLAGS)" \
 	    "CFLAGS=$(CFLAGS)" \
+	    "CXXFLAGS=$(CCFLAGS)" \
+	    "LDFLAGS=$(LDFLAGS) $(SVN_LDFLAGS)" \
 	    "SWIG=$(SWIGPROG)" \
 	    "PERL=$(PERL)" \
 	    "ROOT=$(ROOT)" \
-	    "INSTALL=/usr/ucb/install -c" \
-	    PATH=$(SFW_PATH) \
-	    MAKE=$(CCSMAKE) \
-	    ./configure --prefix=/usr --with-apxs=$(ROOT)$(APACHE_USR_PREFIX)/bin/apxs \
-	    --with-ssl --with-zlib --with-jdk=$(JAVA_ROOT) \
-	    --with-apr=$(ROOT)$(APR_USR_PREFIX) --with-apr-util=$(ROOT)$(APR_UTIL_USR_PREFIX) \
-	    --disable-mod-activation --enable-javahl --disable-static \
-	    --enable-shared --with-swig --libdir=/usr/lib/svn \
-	    --with-neon=$(ROOT)/usr)
+	    "INSTALL=$(GINSTALL)" \
+	    "PATH=$(SFW_PATH)" \
+	    "MAKE=$(GMAKE)" \
+	    "NEON_LIBS=-L$(ROOT)/usr/lib -lneon" \
+	    ./configure \
+	    --prefix=$(PREFIX) \
+	    --libdir=$(PREFIX)/lib/svn \
+	    --localstatedir=/var \
+	    --enable-shared \
+	    --disable-static \
+	    --disable-libtool-lock \
+	    --disable-neon-version-check \
+	    --disable-experimental-libtool \
+	    --with-apxs=$(ROOT)$(APACHE_USR_PREFIX)/bin/apxs \
+	    --with-ssl \
+	    --with-zlib=$(ROOT)/usr \
+	    --with-jdk=$(JAVA_ROOT) \
+	    --with-apr=$(ROOT)$(APR_USR_PREFIX) \
+	    --with-apr-util=$(ROOT)$(APR_UTIL_USR_PREFIX) \
+	    --enable-nls \
+	    --disable-mod-activation \
+	    --enable-javahl \
+	    --disable-static \
+	    --enable-shared \
+	    --with-swig \
+	    --with-neon=$(ROOT)/usr )
 
-	
+$(VERPY26)/config.status: $(VERPY26)/configure
+	( cd $(VERPY26) ; env - \
+	    "PYVER=$(PYVER26)" \
+	    "PYTHON=$(PYTHON26)" \
+	    "PYDIR=$(PYDIR26)" \
+	    "PYVENDORDIR=$(PYVENDORDIR26)" \
+	    "PYMODS=$(PYMODS)" \
+	    "CC=$(CC)" \
+	    "CXX=$(CCC)" \
+	    "CPPFLAGS=$(CPPFLAGS)" \
+	    "CFLAGS=$(CFLAGS)" \
+	    "CXXFLAGS=$(CCFLAGS)" \
+	    "LDFLAGS=$(LDFLAGS) $(SVN_LDFLAGS)" \
+	    "SWIG=$(SWIGPROG)" \
+	    "PERL=$(PERL)" \
+	    "ROOT=$(ROOT)" \
+	    "INSTALL=$(GINSTALL)" \
+	    "PATH=$(SFW_PATH)" \
+	    "MAKE=$(GMAKE)" \
+	    "NEON_LIBS=-L$(ROOT)/usr/lib -lneon" \
+	    ./configure \
+	    --prefix=$(PREFIX) \
+	    --libdir=$(PREFIX)/lib/svn \
+	    --localstatedir=/var \
+	    --enable-shared \
+	    --disable-static \
+	    --disable-libtool-lock \
+	    --disable-neon-version-check \
+	    --disable-experimental-libtool \
+	    --with-apxs=$(ROOT)$(APACHE_USR_PREFIX)/bin/apxs \
+	    --with-ssl \
+	    --with-zlib=$(ROOT)/usr \
+	    --with-jdk=$(JAVA_ROOT) \
+	    --with-apr=$(ROOT)$(APR_USR_PREFIX) \
+	    --with-apr-util=$(ROOT)$(APR_UTIL_USR_PREFIX) \
+	    --enable-nls \
+	    --disable-mod-activation \
+	    --enable-javahl \
+	    --disable-static \
+	    --enable-shared \
+	    --with-swig \
+	    --with-neon=$(ROOT)/usr )
+
 $(VER)/configure: $(VER).tar.gz
 	gzip -dc $(VER).tar.gz | tar xopf -
-	gpatch -p0 < $(VER).patch
+	( cd $(VER) ; \
+	    gpatch -p0 <../$(VER).patch )
 	touch $(VER)/configure
-	chmod -R a+r $(VER)
-	find $(VER) -type d -exec chmod a+x {} \;
+	chmod 0755 $(VER)/configure
+	chmod 0755 $(VER)
+	find $(VER) -type d -exec chmod 0755 {} \;
+
+$(VERPY26)/configure: $(VER).tar.gz
+	mkdir -p tmp
+	gzip -dc $(VER).tar.gz | ( cd tmp ; $(TAR) xopf - )
+	mv tmp/$(VER) $(VERPY26)
+	rm -rf tmp
+	( cd $(VERPY26) ; \
+	    gpatch -p0 <../$(VERPY26).patch )
+	chmod 0755 $(VERPY26)/configure
+	chmod 0755 $(VERPY26)
+	find $(VERPY26) -type d -exec chmod 0755 {} \;
 
 clean:
-	-rm -rf $(VER)
-	-rm -f .distinst-stamp
+	-rm -rf $(VER) $(VERPY26) $(DESTDIR)
 
 include ../Makefile.targ
 
-$(ROOTSHAREMAN)/man1/%.1: sunman/%.1.sunman
-	$(INS.rename)
-
-$(ROOTSHAREMAN)/man5/%.5: sunman/%.5.sunman
-	$(INS.rename)
-
-$(ROOTSHAREMAN)/man8/%.8: sunman/%.8.sunman
-	$(INS.rename)
-
-$(ROOTSHARELOCALE)/%/LC_MESSAGES/subversion.mo: $(VER)/subversion/po/%.mo
-	$(INS.rename)
-
-$(ROOTSVNINCLUDE)/%: $(VER)/subversion/include/%
-	$(INS.file)
-
-$(ROOTSHARELIB)/java/%: $(VER)/subversion/bindings/java/javahl/%
-	$(INS.file)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/subversion/install-sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,244 @@
+#!/bin/bash
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)install-sfw	1.1	09/09/30 SMI"
+
+VERS=subversion-1.6.5
+VERSPY26=subversion-1.6.5-py26
+APR_VERSION=1.3
+APACHE_VERSION=2.2
+
+PREFIX=${ROOT}/usr
+BINDIR=${PREFIX}/bin
+LIBDIR=${PREFIX}/lib/svn
+INCLUDEDIR=${PREFIX}/include/svn
+JARLIBDIR=${PREFIX}/share/lib/java
+LOCALEDIR=${PREFIX}/share/locale
+APACHEMODDIR=${PREFIX}/apache2/${APACHE_VERSION}/libexec
+SHAREDMODRUNPATH=/usr/lib/svn:/usr/apr/${APR_VERSION}/lib:/usr/apr-util/${APR_VERSION}/lib
+MAN1DIR=${PREFIX}/share/man/man1
+MAN5DIR=${PREFIX}/share/man/man5
+MAN8DIR=${PREFIX}/share/man/man8
+ROOTMAN1DIR=${MAN1DIR}
+ROOTMAN5DIR=${MAN5DIR}
+ROOTMAN8DIR=${MAN8DIR}
+
+if [ "x${INSTDIR}" = "x" ] || [ "x${TOP}" = "x" ] ; then
+    exit 1
+fi
+
+MANSCRIPT=${TOP}/sunman.sed
+. ${SRC}/tools/install.subr
+
+for file in \
+    "svn" \
+    "svnadmin" \
+    "svndumpfilter" \
+    "svnlook" \
+    "svnserve" \
+    "svnsync" \
+    "svnversion" 
+do
+    elfedit -e "dyn:runpath ${SHAREDMODRUNPATH}" "${INSTDIR}/usr/bin/${file}"
+    _install E ${INSTDIR}/usr/bin/${file} ${BINDIR}/${file} 0755
+done
+
+for file in \
+    "mod_authz_svn.h" \
+    "mod_dav_svn.h" \
+    "svn_auth.h" \
+    "svn_base64.h" \
+    "svn_checksum.h" \
+    "svn_client.h" \
+    "svn_cmdline.h" \
+    "svn_compat.h" \
+    "svn_config.h" \
+    "svn_ctype.h" \
+    "svn_dav.h" \
+    "svn_delta.h" \
+    "svn_diff.h" \
+    "svn_dirent_uri.h" \
+    "svn_dso.h" \
+    "svn_error.h" \
+    "svn_error_codes.h" \
+    "svn_fs.h" \
+    "svn_hash.h" \
+    "svn_io.h" \
+    "svn_iter.h" \
+    "svn_md5.h" \
+    "svn_mergeinfo.h" \
+    "svn_nls.h" \
+    "svn_opt.h" \
+    "svn_path.h" \
+    "svn_pools.h" \
+    "svn_props.h" \
+    "svn_quoprint.h" \
+    "svn_ra.h" \
+    "svn_ra_svn.h" \
+    "svn_repos.h" \
+    "svn_sorts.h" \
+    "svn_string.h" \
+    "svn_subst.h" \
+    "svn_time.h" \
+    "svn_types.h" \
+    "svn_user.h" \
+    "svn_utf.h" \
+    "svn_version.h" \
+    "svn_wc.h" \
+    "svn_xml.h"
+do
+    _install N ${INSTDIR}/usr/include/subversion-1/${file} ${INCLUDEDIR}/${file} 0444
+done
+
+for file in \
+    "mod_authz_svn" \
+    "mod_dav_svn"
+do
+    elfedit -e "dyn:runpath ${SHAREDMODRUNPATH}" "${VERS}/subversion/${file}/.libs/${file}.so"
+    _install D "${VERS}/subversion/${file}/.libs/${file}.so" ${APACHEMODDIR}/${file}.so 0555
+done
+
+for file in \
+    "libsvn_client-1" \
+    "libsvn_delta-1" \
+    "libsvn_diff-1" \
+    "libsvn_fs-1" \
+    "libsvn_fs_fs-1" \
+    "libsvn_fs_util-1" \
+    "libsvn_ra-1" \
+    "libsvn_ra_local-1" \
+    "libsvn_ra_neon-1" \
+    "libsvn_ra_svn-1" \
+    "libsvn_repos-1" \
+    "libsvn_subr-1" \
+    "libsvn_swig_perl-1" \
+    "libsvn_swig_py-1" \
+    "libsvn_wc-1" \
+    "libsvnjavahl-1"
+do
+    elfedit -e "dyn:runpath ${SHAREDMODRUNPATH}" ${INSTDIR}/usr/lib/svn/${file}.so.0.0.0
+    _install D ${INSTDIR}/usr/lib/svn/${file}.so.0.0.0 ${LIBDIR}/${file}.so.0.0.0 0755
+    _install L ${file}.so.0.0.0 ${LIBDIR}/${file}.so.0
+    _install L ${file}.so.0.0.0 ${LIBDIR}/${file}.so
+done
+
+_install N ${INSTDIR}/usr/lib/svn/svn-javahl/svn-javahl.jar ${JARLIBDIR}/svn-javahl.jar 0444
+
+PYTHON_VERSION=2.4
+PYTHONVENDORDIR=${PREFIX}/lib/python${PYTHON_VERSION}/vendor-packages
+
+for PYTHON_VERSION in \
+	"2.4" \
+	"2.6"
+do
+	PYTHONVENDORDIR=${PREFIX}/lib/python${PYTHON_VERSION}/vendor-packages
+
+	for file in \
+		"_client.so" \
+		"_core.so" \
+		"_delta.so" \
+		"_diff.so" \
+		"_fs.so" \
+		"_ra.so" \
+		"_repos.so" \
+		"_wc.so"
+	do
+		elfedit -e "dyn:runpath ${SHAREDMODRUNPATH}" ${INSTDIR}/usr/lib/python${PYTHON_VERSION}/vendor-packages/libsvn/${file}
+		_install D ${INSTDIR}/usr/lib/python${PYTHON_VERSION}/vendor-packages/libsvn/${file} ${PYTHONVENDORDIR}/libsvn/${file} 0755
+	done
+
+	for file in \
+		"client" \
+		"core" \
+		"delta" \
+		"diff" \
+		"fs" \
+		"ra" \
+		"repos" \
+		"wc" \
+		"__init__"
+	do
+			_install N ${INSTDIR}/usr/lib/python${PYTHON_VERSION}/vendor-packages/libsvn/${file}.py ${PYTHONVENDORDIR}/libsvn/${file}.py 0644
+			_install N ${INSTDIR}/usr/lib/python${PYTHON_VERSION}/vendor-packages/libsvn/${file}.pyc ${PYTHONVENDORDIR}/libsvn/${file}.pyc 0644
+	done
+
+	for file in \
+		"client" \
+		"core" \
+		"delta" \
+		"diff" \
+		"fs" \
+		"ra" \
+		"repos" \
+		"wc" \
+		"__init__" 
+	do
+		_install N ${INSTDIR}/usr/lib/python${PYTHON_VERSION}/vendor-packages/svn/${file}.py ${PYTHONVENDORDIR}/svn/${file}.py 0644
+		_install N ${INSTDIR}/usr/lib/python${PYTHON_VERSION}/vendor-packages/svn/${file}.pyc ${PYTHONVENDORDIR}/svn/${file}.pyc 0644
+	done
+done
+
+for file in \
+	"svn.1" \
+    "svnadmin.1" \
+    "svndumpfilter.1" \
+    "svnlook.1" \
+    "svnsync.1" \
+    "svnversion.1"
+do
+    _install M ${INSTDIR}/usr/share/man/man1/${file} ${MAN1DIR}/${file} 0444
+done
+
+for file in \
+    "svnserve.conf.5"
+do
+    _install M ${INSTDIR}/usr/share/man/man5/${file} ${MAN5DIR}/${file} 0444
+done
+
+for file in \
+    "svnserve.8"
+do
+    _install M ${INSTDIR}/usr/share/man/man8/${file} ${MAN8DIR}/${file} 0444
+done
+
+for file in \
+    "de" \
+    "es" \
+    "fr" \
+    "it" \
+    "ja" \
+    "ko" \
+    "nb" \
+    "pl" \
+    "pt_BR" \
+    "sv" \
+    "zh_CN" \
+    "zh_TW"
+do
+    _install N ${INSTDIR}/usr/share/locale/${file}/LC_MESSAGES/subversion.mo ${LOCALEDIR}/${file}/LC_MESSAGES/subversion.mo 0444
+done
+
+exit 0
+
--- a/usr/src/cmd/subversion/subversion-1.4.3.patch	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- subversion-1.4.3/configure.orig	2007-01-17 23:17:34.000000000 +0100
-+++ subversion-1.4.3/configure	2007-03-16 11:11:50.010886628 +0100
-@@ -4003,8 +4003,8 @@
-         if test "$NEON_VERSION" = "$svn_allowed_neon" ||
-            test "$svn_allowed_neon" = "any"; then
-             svn_allowed_neon_on_system="yes"
--            SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
--            NEON_LIBS=`$neon_config --la-file`
-+	    SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
-+	    NEON_LIBS=${ROOT}/usr/lib/libneon.so
-             CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
-             svn_lib_neon="yes"
-             break
---- subversion-1.4.3/Makefile.in.orig	2006-08-23 17:12:43.000000000 +0200
-+++ subversion-1.4.3/Makefile.in	2007-03-16 11:47:09.095628690 +0100
-@@ -39,7 +39,7 @@
- 
- NEON_LIBS = @NEON_LIBS@
- SVN_APR_LIBS = @SVN_APR_LIBS@
--SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@
-+SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@ -L$(ROOT)/usr/sfw/lib -R/usr/sfw/lib
- SVN_DB_LIBS =
- SVN_SERF_LIBS = @SVN_SERF_LIBS@
- 
-@@ -66,8 +66,8 @@
- swig_rb_libdir = @libdir@
- 
- ### these possibly need further discussion
--swig_pydir = @libdir@/svn-python/libsvn
--swig_pydir_extra = @libdir@/svn-python/svn
-+swig_pydir = /usr/lib/python2.4/vendor-packages/libsvn
-+swig_pydir_extra = /usr/lib/python2.4/vendor-packages/svn
- swig_pldir = @libdir@/svn-perl
- swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
- 
Binary file usr/src/cmd/subversion/subversion-1.4.3.tar.gz has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/subversion/subversion-1.6.5-py26.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,71 @@
+--- configure	2009-09-23 20:05:36.124131000 -0700
++++ configure	2009-09-23 21:45:10.895445310 -0700
+@@ -5097,11 +5097,11 @@
+            test "$svn_allowed_neon" = "any"; then
+             svn_allowed_neon_on_system="yes"
+             if test "$NEON_PKG_CONFIG" = "yes"; then
+-              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`
+-              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"
++              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
++              CFLAGS="$CFLAGS"
+               old_CFLAGS="$CFLAGS"
+               old_LIBS="$LIBS"
+-              NEON_LIBS=`$PKG_CONFIG neon --libs`
++              NEON_LIBS="-L${ROOT}/lib -lneon"
+               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
+               LIBS="$LIBS $NEON_LIBS"
+               neon_test_code="
+@@ -5188,9 +5188,9 @@
+               CFLAGS="$old_CFLAGS"
+               LIBS="$old_LIBS"
+             else
+-              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
+-              CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
+-              NEON_LIBS=`$neon_config --libs`
++              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
++              CFLAGS="$CFLAGS"
++              NEON_LIBS="-L${ROOT}/lib -lneon"
+             fi
+             svn_lib_neon="yes"
+             break
+@@ -5578,11 +5578,11 @@
+            test "$svn_allowed_neon" = "any"; then
+             svn_allowed_neon_on_system="yes"
+             if test "$NEON_PKG_CONFIG" = "yes"; then
+-              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`
+-              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"
++              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
++              CFLAGS="$CFLAGS"
+               old_CFLAGS="$CFLAGS"
+               old_LIBS="$LIBS"
+-              NEON_LIBS=`$PKG_CONFIG neon --libs`
++              NEON_LIBS="-L${ROOT}/lib -lneon"
+               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
+               LIBS="$LIBS $NEON_LIBS"
+               neon_test_code="
+@@ -5669,9 +5669,9 @@
+               CFLAGS="$old_CFLAGS"
+               LIBS="$old_LIBS"
+             else
+-              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
+-              CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
+-              NEON_LIBS=`$neon_config --libs`
++              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
++              CFLAGS="$CFLAGS"
++              NEON_LIBS="-L${ROOT}/lib -lneon"
+             fi
+             svn_lib_neon="yes"
+             break
+--- Makefile.in	2009-02-16 08:10:48.000000000 -0800
++++ Makefile.in	2009-09-23 21:35:11.885785150 -0700
+@@ -76,8 +76,8 @@
+ swig_rb_libdir = @libdir@
+ 
+ ### these possibly need further discussion
+-swig_pydir = @libdir@/svn-python/libsvn
+-swig_pydir_extra = @libdir@/svn-python/svn
++swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn
++swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn
+ swig_pldir = @libdir@/svn-perl
+ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
+ contribdir = @bindir@/svn-contrib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/subversion/subversion-1.6.5.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,71 @@
+--- configure	2009-09-23 20:05:36.124131000 -0700
++++ configure	2009-09-23 21:45:10.895445310 -0700
+@@ -5097,11 +5097,11 @@
+            test "$svn_allowed_neon" = "any"; then
+             svn_allowed_neon_on_system="yes"
+             if test "$NEON_PKG_CONFIG" = "yes"; then
+-              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`
+-              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"
++              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
++              CFLAGS="$CFLAGS"
+               old_CFLAGS="$CFLAGS"
+               old_LIBS="$LIBS"
+-              NEON_LIBS=`$PKG_CONFIG neon --libs`
++              NEON_LIBS="-L${ROOT}/lib -lneon"
+               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
+               LIBS="$LIBS $NEON_LIBS"
+               neon_test_code="
+@@ -5188,9 +5188,9 @@
+               CFLAGS="$old_CFLAGS"
+               LIBS="$old_LIBS"
+             else
+-              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
+-              CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
+-              NEON_LIBS=`$neon_config --libs`
++              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
++              CFLAGS="$CFLAGS"
++              NEON_LIBS="-L${ROOT}/lib -lneon"
+             fi
+             svn_lib_neon="yes"
+             break
+@@ -5578,11 +5578,11 @@
+            test "$svn_allowed_neon" = "any"; then
+             svn_allowed_neon_on_system="yes"
+             if test "$NEON_PKG_CONFIG" = "yes"; then
+-              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`
+-              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"
++              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
++              CFLAGS="$CFLAGS"
+               old_CFLAGS="$CFLAGS"
+               old_LIBS="$LIBS"
+-              NEON_LIBS=`$PKG_CONFIG neon --libs`
++              NEON_LIBS="-L${ROOT}/lib -lneon"
+               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
+               LIBS="$LIBS $NEON_LIBS"
+               neon_test_code="
+@@ -5669,9 +5669,9 @@
+               CFLAGS="$old_CFLAGS"
+               LIBS="$old_LIBS"
+             else
+-              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
+-              CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
+-              NEON_LIBS=`$neon_config --libs`
++              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
++              CFLAGS="$CFLAGS"
++              NEON_LIBS="-L${ROOT}/lib -lneon"
+             fi
+             svn_lib_neon="yes"
+             break
+--- Makefile.in	2009-02-16 08:10:48.000000000 -0800
++++ Makefile.in	2009-09-23 21:35:11.885785150 -0700
+@@ -76,8 +76,8 @@
+ swig_rb_libdir = @libdir@
+ 
+ ### these possibly need further discussion
+-swig_pydir = @libdir@/svn-python/libsvn
+-swig_pydir_extra = @libdir@/svn-python/svn
++swig_pydir = /usr/lib/python2.4/vendor-packages/libsvn
++swig_pydir_extra = /usr/lib/python2.4/vendor-packages/svn
+ swig_pldir = @libdir@/svn-perl
+ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
+ contribdir = @bindir@/svn-contrib
Binary file usr/src/cmd/subversion/subversion-1.6.5.tar.gz has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/subversion/sunman.sed	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)sunman.sed	1.1	09/09/24 SMI"
+#
+1i\
+'\\" t\
+.\\"\
+.\\" Modified for Solaris to to add the Solaris stability classification,\
+.\\" and to add a note about source availability.\
+.\\"
+$a\
+.\\" Begin Sun update\
+.SH ATTRIBUTES\
+See\
+.BR attributes (5)\
+for descriptions of the following attributes:\
+.sp\
+.TS\
+box;\
+cbp-1 | cbp-1\
+l | l .\
+ATTRIBUTE TYPE	ATTRIBUTE VALUE\
+=\
+Availability	SUNWsvn\
+=\
+Interface Stability	Committed\
+.TE\
+.PP\
+.SH NOTES\
+Source for Subversion is available on http://opensolaris.org.\
+.\\" End Sun update
--- a/usr/src/cmd/subversion/sunman/svn.1.sunman	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-'\" t
-.\"
-.\" Modified for Solaris to to add the Solaris stability classification,
-.\" and to add a note about source availability.
-.\"
-.TH svn 1
-.SH NAME
-svn \- Subversion command line client tool
-.SH SYNOPSIS
-.TP
-\fBsvn\fP \fIcommand\fP [\fIoptions\fP] [\fIargs\fP]
-.SH OVERVIEW
-Subversion is a version control system, which allows you to keep old
-versions of files and directories (usually source code), keep a log of
-who, when, and why changes occurred, etc., like CVS, RCS or SCCS.
-\fBSubversion\fP keeps a single copy of the master sources.  This copy
-is called the source ``repository''; it contains all the information
-to permit extracting previous versions of those files at any time.
-
-For more information about the Subversion project, visit 
-http://subversion.tigris.org.
-
-Documentation for Subversion and its tools, including detailed usage
-explanations of the \fBsvn\fP, \fBsvnadmin\fP, \fBsvnserve\fP and
-\fBsvnlook\fP programs, historical background, philosophical 
-approaches and reasonings, etc., can be found at 
-http://svnbook.red-bean.com/.
-
-Run `svn help' to access the built-in tool documentation..\\" Begin Sun update
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-box;
-cbp-1 | cbp-1
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-=
-Availability	SUNWsvn
-=
-Interface Stability	Committed
-.TE
-.PP
-.SH NOTES
-Source for Subversion is available on http://opensolaris.org.
-.\" End Sun update
--- a/usr/src/cmd/subversion/sunman/svnadmin.1.sunman	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-'\" t
-.\"
-.\" Modified for Solaris to to add the Solaris stability classification,
-.\" and to add a note about source availability.
-.\"
-.TH svnadmin 1
-.SH NAME
-svnadmin \- Subversion repository administration tool
-.SH SYNOPSIS
-.TP
-\fBsvnadmin\fP \fIcommand\fP \fI/path/to/repos\fP [\fIoptions\fP] [\fIargs\fP]
-.SH OVERVIEW
-Subversion is a version control system, which allows you to keep old
-versions of files and directories (usually source code), keep a log of
-who, when, and why changes occurred, etc., like CVS, RCS or SCCS.
-\fBSubversion\fP keeps a single copy of the master sources.  This copy
-is called the source ``repository''; it contains all the information
-to permit extracting previous versions of those files at any time.
-
-For more information about the Subversion project, visit 
-http://subversion.tigris.org.
-
-Documentation for Subversion and its tools, including detailed usage
-explanations of the \fBsvn\fP, \fBsvnadmin\fP, \fBsvnserve\fP and
-\fBsvnlook\fP programs, historical background, philosophical 
-approaches and reasonings, etc., can be found at 
-http://svnbook.red-bean.com/.
-
-Run `svnadmin help' to access the built-in tool documentation..\\" Begin Sun update
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-box;
-cbp-1 | cbp-1
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-=
-Availability	SUNWsvn
-=
-Interface Stability	Committed
-.TE
-.PP
-.SH NOTES
-Source for Subversion is available on http://opensolaris.org.
-.\" End Sun update
--- a/usr/src/cmd/subversion/sunman/svndumpfilter.1.sunman	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-'\" t
-.\"
-.\" Modified for Solaris to to add the Solaris stability classification,
-.\" and to add a note about source availability.
-.\"
-.TH svndumpfilter 1
-.SH NAME
-svndumpfilter \- Filter a subversion repository 'dumpfile'.
-.SH SYNOPSIS
-.TP
-\fBsvndumpfilter\fP \fIcommand\fP [\fIoptions\fP & \fIargs\fP]
-.SH OVERVIEW
-Subversion is a version control system, which allows you to keep old
-versions of files and directories (usually source code), keep a log of
-who, when, and why changes occurred, etc., like CVS, RCS or SCCS.
-\fBSubversion\fP keeps a single copy of the master sources.  This copy
-is called the source ``repository''; it contains all the information
-to permit extracting previous versions of those files at any time.
-
-For more information about the Subversion project, visit 
-http://subversion.tigris.org.
-
-Documentation for Subversion and its tools, including detailed usage
-explanations of the \fBsvn\fP, \fBsvnadmin\fP, \fBsvnserve\fP and
-\fBsvnlook\fP programs, historical background, philosophical 
-approaches and reasonings, etc., can be found at 
-http://svnbook.red-bean.com/.
-
-Run `svndumpfilter help' to access the built-in tool documentation.
-.\\" Begin Sun update
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-box;
-cbp-1 | cbp-1
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-=
-Availability	SUNWsvn
-=
-Interface Stability	Volatile
-.TE
-.PP
-.SH NOTES
-Source for Subversion is available on http://opensolaris.org.
-.\" End Sun update
--- a/usr/src/cmd/subversion/sunman/svnlook.1.sunman	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-'\" t
-.\"
-.\" Modified for Solaris to to add the Solaris stability classification,
-.\" and to add a note about source availability.
-.\"
-.TH svnlook 1
-.SH NAME
-svnlook \- Subversion repository examination tool
-.SH SYNOPSIS
-.TP
-\fBsvnlook\fP \fIcommand\fP \fI/path/to/repos\fP [\fIoptions\fP] [\fIargs\fP]
-.SH OVERVIEW
-Subversion is a version control system, which allows you to keep old
-versions of files and directories (usually source code), keep a log of
-who, when, and why changes occurred, etc., like CVS, RCS or SCCS.
-\fBSubversion\fP keeps a single copy of the master sources.  This copy
-is called the source ``repository''; it contains all the information
-to permit extracting previous versions of those files at any time.
-
-For more information about the Subversion project, visit 
-http://subversion.tigris.org.
-
-Documentation for Subversion and its tools, including detailed usage
-explanations of the \fBsvn\fP, \fBsvnadmin\fP, \fBsvnserve\fP and
-\fBsvnlook\fP programs, historical background, philosophical 
-approaches and reasonings, etc., can be found at 
-http://svnbook.red-bean.com/.
-
-Run `svnlook help' to access the built-in tool documentation..\\" Begin Sun update
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-box;
-cbp-1 | cbp-1
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-=
-Availability	SUNWsvn
-=
-Interface Stability	Volatile
-.TE
-.PP
-.SH NOTES
-Source for Subversion is available on http://opensolaris.org.
-.\" End Sun update
--- a/usr/src/cmd/subversion/sunman/svnserve.8.sunman	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-'\" t
-.\"
-.\" Modified for Solaris to to add the Solaris stability classification,
-.\" and to add a note about source availability.
-.\"
-.TH svnserve 8
-.SH NAME
-svnserve \- Server for the 'svn' repository access method
-.SH SYNOPSIS
-.TP
-\fBsvnserve\fP [\fIoptions\fP]
-.SH DESCRIPTION
-\fBsvnserve\fP allows access to Subversion repositories using the svn
-network protocol.  It can both run as a standalone server process, or
-it can run out of inetd.  You must choose a mode of operation when you
-start \fBsvnserve\fP.  The following options are recognized:
-.PP
-.TP 5
-\fB\-d\fP, \fB\-\-daemon\fP
-Causes \fBsvnserve\fP to run in daemon mode.  \fBsvnserve\fP
-backgrounds itself and accepts and serves TCP/IP connections on the
-svn port (3690, by default).
-.PP
-.TP 5
-\fB\-\-listen-port\fP=\fIport\fP
-Causes \fBsvnserve\fP to listen on \fIport\fP when run in daemon mode.
-.PP
-.TP 5
-\fB\-\-listen-host\fP=\fIhost\fP
-Causes \fBsvnserve\fP to listen on the interface specified by \fIhost\fP,
-which may be either a hostname or an IP address.
-.PP
-.TP 5
-\fB\-\-foreground\fP
-When used together with \fB\-d\fP, this option causes \fBsvnserve\fP
-to stay in the foreground.  This option is mainly useful for
-debugging.
-.PP
-.TP 5
-\fB\-i\fP, \fB\-\-inetd\fP
-Causes \fBsvnserve\fP to use the stdin/stdout file descriptors, as is
-appropriate for a daemon running out of inetd.
-.PP
-.TP 5
-\fB\-h\fP, \fB\-\-help\fP
-Displays a usage summary and exits.
-.PP
-.TP 5
-\fB\-r\fP \fIroot\fP, \fB\-\-root\fP=\fIroot\fP
-Sets the virtual root for repositories served by \fBsvnserve\fP.  The
-pathname in URLs provided by the client will be interpreted relative
-to this root, and will not be allowed to escape this root.
-.PP
-.TP 5
-\fB\-R\fP \fB\-\-read-only\fP
-Force all write operations through this \fBsvnserve\fP instance to be
-forbidden, overriding all other access policy configuration.  Do not
-use this option to set general repository access policy - that is what
-the \fBconf/svnserve.conf\fP repository configuration file is for.
-This option should be used only to restrict access via a certain
-method of invoking \fBsvnserve\fP - for example, to allow write access
-via SSH, but not via a \fBsvnserve\fP daemon, or to create a
-restricted SSH key which is only capable of read access.
-.PP
-.TP 5
-\fB\-t\fP, \fB\-\-tunnel\fP
-Causes \fBsvnserve\fP to run in tunnel mode, which is just like the
-inetd mode of operation (serve one connection over stdin/stdout)
-except that the connection is considered to be pre-authenticated with
-the username of the current uid.  This flag is selected by the client
-when running over a tunnel agent.
-.PP
-.TP 5
-\fB\-\-tunnel-user\fP=\fIusername\fP
-When combined with \fB\-\-tunnel\fP, overrides the pre-authenticated
-username with the supplied \fIusername\fP.  This is useful in
-combination with the ssh authorized_key file's "command" directive to
-allow a single system account to be used by multiple committers, each
-having a distinct ssh identity.
-.PP
-.TP 5
-\fB\-T\fP, \fB\-\-threads\fP
-When running in daemon mode, causes \fBsvnserve\fP to spawn a thread
-instead of a process for each connection.  The \fBsvnserve\fP process
-still backgrounds itself at startup time.
-.PP
-.TP 5
-\fB\-X\fP, \fB\-\-listen\-once\fP
-Causes \fBsvnserve\fP to accept one connection on the svn port, serve
-it, and exit.  This option is mainly useful for debugging.
-.PP
-Once the client has selected a repository by transmitting its URL,
-\fBsvnserve\fP reads a file named \fBconf/svnserve.conf\fP in the
-repository directory to determine repository-specific settings such as
-what authentication database to use and what authorization policies to
-apply.  See the \fBsvnserve.conf\fP(5) man page for details of that
-file format.
-
-.\\" Begin Sun update
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-box;
-cbp-1 | cbp-1
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-=
-Availability	SUNWsvn
-=
-Interface Stability	Committed
-.TE
-.PP
-.SH NOTES
-Source for Subversion is available on http://opensolaris.org.
-.\" End Sun update
--- a/usr/src/cmd/subversion/sunman/svnserve.conf.5.sunman	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-'\" t
-.\"
-.\" Modified for Solaris to to add the Solaris stability classification,
-.\" and to add a note about source availability.
-.\"
-.TH svnserve.conf 5
-.SH NAME
-svnserve.conf \- Repository configuration file for svnserve
-.SH SYNOPSIS
-.TP
-\fIrepository-path\fP\fB/conf/svnserve.conf\fP
-.SH DESCRIPTION
-\fBsvnserve.conf\fP controls the behavior of the \fBsvnserve\fP daemon
-on a per-repository basis.  It is located in the \fBconf\fP
-subdirectory of the repository.
-.PP
-The overall structure of the file is the same as the structure of
-Subversion user configuration files.  At the top level are sections,
-which are specified by words in square brackets; inside each section
-are variable definitions of the form "variable = value".  Lines
-beginning with '#' are ignored.  \fBsvnserve.conf\fP currently uses
-only one section named "general", and supports the following
-variables:
-.PP
-.TP 5
-\fBanon-access\fP = \fBnone\fP|\fBread\fP|\fBwrite\fP
-Determines the access level for unauthenticated users.  \fBwrite\fP
-access allows all repository operations.  \fBread\fP access allows all
-operations except committing and changing revision properties.
-\fBnone\fP access allows no access.  The default level is \fBread\fP.
-.PP
-.TP 5
-\fBauth-access\fP = \fBnone\fP|\fBread\fP|\fBwrite\fP
-Determines the access level for authenticated users, using the same
-access levels as above.  The default level is \fBwrite\fP.
-.PP
-.TP 5
-\fBpassword-db\fP = \fIfilename\fP
-Sets the location of the password database.  \fIfilename\fP may be
-relative to the repository conf directory.  There is no default value.
-The password database has the same overall format as this file.  It
-uses only one section "users"; each variable within the section is a
-username, and each value is a password.
-.PP
-.TP 5
-\fBrealm\fP = \fIrealm\-name\fP
-Sets the authentication realm of the repository.  If two repositories
-have the same password database, they should have the same realm, and
-vice versa; this association allows clients to use a single cached
-password for several repositories.  The default realm value is the
-repository's uuid.
-.SH EXAMPLE
-The following example \fBsvnserve.conf\fP allows read access for
-authenticated users, no access for anonymous users, points to a passwd
-database in the same directory, and defines a realm name.
-.PP
-.nf
- [general]
- anon-access = none
- auth-access = read
- password-db = passwd
- realm = My First Repository
-.fi
-.PP
-The file "passwd" would look like:
-.PP
-.nf
- [users]
- joeuser = joepassword
- jayrandom = randomjay
-.fi
-.SH SEE ALSO
-.BR svnserve (8)
-.\\" Begin Sun update
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-box;
-cbp-1 | cbp-1
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-=
-Availability	SUNWsvn
-=
-Interface Stability	Committed
-.TE
-.PP
-.SH NOTES
-Source for Subversion is available on http://opensolaris.org.
-.\" End Sun update
--- a/usr/src/cmd/subversion/sunman/svnsync.1.sunman	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-'\" t
-.\"
-.\" Modified for Solaris to to add the Solaris stability classification,
-.\" and to add a note about source availability.
-.\"
-.TH svnsync 1
-.SH NAME
-svnsync \- Subversion repository synchronization tool
-.SH SYNOPSIS
-.TP
-\fBsvnsync\fP \fIcommand\fP \fIdest-url\fP [\fIoptions\fP] [\fIargs\fP]
-.SH OVERVIEW
-Subversion is a version control system, which allows you to keep old
-versions of files and directories (usually source code), keep a log of
-who, when, and why changes occurred, etc., like CVS, RCS or SCCS.
-\fBSubversion\fP keeps a single copy of the master sources.  This copy
-is called the source ``repository''; it contains all the information
-to permit extracting previous versions of those files at any time.
-
-For more information about the Subversion project, visit 
-http://subversion.tigris.org.
-
-Documentation for Subversion and its tools, including detailed usage
-explanations of the \fBsvn\fP, \fBsvnadmin\fP, \fBsvnserve\fP and
-\fBsvnlook\fP programs, historical background, philosophical 
-approaches and reasonings, etc., can be found at 
-http://svnbook.red-bean.com/.
-
-Run `svnsync help' to access the built-in tool documentation.
-.\\" Begin Sun update
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-box;
-cbp-1 | cbp-1
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-=
-Availability	SUNWsvn
-=
-Interface Stability	Volatile
-.TE
-.PP
-.SH NOTES
-Source for Subversion is available on http://opensolaris.org.
-.\" End Sun update
--- a/usr/src/cmd/subversion/sunman/svnversion.1.sunman	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-'\" t
-.\"
-.\" Modified for Solaris to to add the Solaris stability classification,
-.\" and to add a note about source availability.
-.\"
-.TH svnversion 1
-.SH NAME
-svnversion \- Produce a compact version number for a working copy.
-.SH SYNOPSIS
-.TP
-\fBsvnversion\fP [\fIwc_path\fP [\fItrail_url\fP]]
-.SH OVERVIEW
-Subversion is a version control system, which allows you to keep old
-versions of files and directories (usually source code), keep a log of
-who, when, and why changes occurred, etc., like CVS, RCS or SCCS.
-\fBSubversion\fP keeps a single copy of the master sources.  This copy
-is called the source ``repository''; it contains all the information
-to permit extracting previous versions of those files at any time.
-
-For more information about the Subversion project, visit 
-http://subversion.tigris.org.
-
-Documentation for Subversion and its tools, including detailed usage
-explanations of the \fBsvn\fP, \fBsvnadmin\fP, \fBsvnserve\fP and
-\fBsvnlook\fP programs, historical background, philosophical 
-approaches and reasonings, etc., can be found at 
-http://svnbook.red-bean.com/.
-
-Run `svnversion --help' to access the built-in tool documentation.
-.\\" Begin Sun update
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-box;
-cbp-1 | cbp-1
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-=
-Availability	SUNWsvn
-=
-Interface Stability	Volatile
-.TE
-.PP
-.SH NOTES
-Source for Subversion is available on http://opensolaris.org.
-.\" End Sun update
--- a/usr/src/cmd/tomcat/METADATA	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/tomcat/METADATA	Sun Dec 20 07:12:51 2009 +0200
@@ -2,7 +2,7 @@
 VERSION:          6.0.20
 DESCRIPTION:      for Java Servlet and JavaServer Pages
 LICENSE:          Apache
-PACKAGE:          SUNWtcatr SUNWtcatu
+PACKAGE:          SUNWtcatr SUNWtcatu SUNWtcat-examples
 PROJECT_URL:      http://jakarta.apache.org/tomcat
 SOURCE_DOWNLOAD:  http://apache.ziply.com/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20-src.tar.gz
 SUPPORT:          Managed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/tomcat/Patches/tomcat_strict_servlet.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,58 @@
+--- apache-tomcat-6.0.20-src/bin/catalina.sh.orig	2009-03-30 14:34:02.000000000 -0700
++++ apache-tomcat-6.0.20-src/bin/catalina.sh	2009-03-30 14:40:38.000000000 -0700
+@@ -233,6 +233,7 @@
+         -Dcatalina.base="$CATALINA_BASE" \
+         -Dcatalina.home="$CATALINA_HOME" \
+         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++        -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+         org.apache.catalina.startup.Bootstrap "$@" start
+     else
+       exec "$_RUNJDB" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \
+@@ -241,6 +242,7 @@
+         -Dcatalina.base="$CATALINA_BASE" \
+         -Dcatalina.home="$CATALINA_HOME" \
+         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++        -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+         org.apache.catalina.startup.Bootstrap "$@" start
+     fi
+   fi
+@@ -258,6 +260,7 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++      -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+       org.apache.catalina.startup.Bootstrap "$@" start
+   else
+     exec "$_RUNJAVA" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \
+@@ -265,6 +268,7 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++      -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+       org.apache.catalina.startup.Bootstrap "$@" start
+   fi
+ 
+@@ -282,6 +286,7 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++      -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+       org.apache.catalina.startup.Bootstrap "$@" start \
+       >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
+ 
+@@ -294,6 +299,7 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++      -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+       org.apache.catalina.startup.Bootstrap "$@" start \
+       >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
+ 
+@@ -316,6 +322,7 @@
+     -Dcatalina.base="$CATALINA_BASE" \
+     -Dcatalina.home="$CATALINA_HOME" \
+     -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++    -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+     org.apache.catalina.startup.Bootstrap "$@" stop
+ 
+   if [ $FORCE -eq 1 ]; then
--- a/usr/src/cmd/tomcat/Solaris/http-tomcat6	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/tomcat/Solaris/http-tomcat6	Sun Dec 20 07:12:51 2009 +0200
@@ -20,10 +20,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)http-tomcat6	1.1	08/12/16 SMI"
+#ident	"@(#)http-tomcat6	1.2	09/10/30 SMI"
 #
 
 . /lib/svc/share/smf_include.sh
@@ -44,8 +44,10 @@
 
 CATALINA_HOME=/usr/tomcat6
 CATALINA_BASE=/var/tomcat6
+CATALINA_PID=$CATALINA_BASE/logs/pid
 JAVA_HOME=/usr/java
-export CATALINA_HOME CATALINA_BASE JAVA_HOME
+rm -f $CATALINA_PID
+export CATALINA_HOME CATALINA_BASE CATALINA_PID JAVA_HOME
 $CATALINA_HOME/bin/catalina.sh $cmd 2>&1
 
 if [ $? -ne 0 ]; then
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/tomcat/Solaris/index.jsp	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,15 @@
+<!--
+This file should redirect you to Apache Tomcat default home page which
+was on this system moved from default place $CATALINA_HOME/webapps/ROOT
+to $CATALINA_HOME/webapps/ROOT.example. This was done in order to allow
+deployment of custom ROOT web application while maintain upgrade ability
+via packaging system (without loosing data).
+
+Note that /var/tomcat6/webapps/ROOT.example directory is part of
+SUNWtcat-examples package.
+
+To deploy your ROOT application copy WAR file to
+$CATALINA_HOME/webapps/ROOT.war and remove directory
+$CATALINA_HOME/webapps/ROOT.
+-->
+<meta HTTP-EQUIV="REFRESH" content="0; url=ROOT.example">
--- a/usr/src/cmd/tomcat/Solaris/tomcat.1m.sunman	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/tomcat/Solaris/tomcat.1m.sunman	Sun Dec 20 07:12:51 2009 +0200
@@ -1,7 +1,7 @@
 '\" te
-.\" Copyright (c) 2008, Sun Microsystems Inc.
+.\" Copyright (c) 2009, Sun Microsystems Inc.
 .\" All Rights Reserved.
-.TH tomcat 1M "November 2008" "SunOS 5.11" "System Administration Commands"
+.TH tomcat 1M "October 2009" "SunOS 5.11" "System Administration Commands"
 .SH NAME
 tomcat \- Apache Tomcat Version 6 overview
 .SH DESCRIPTION
@@ -74,7 +74,8 @@
 .sp .6
 .RS 4n
 Contains Tomcat documentation in HTML format. The directory has classical
-WEBAPP structure and it's symbolically linked as /var/tomcat6/webapps/docs.
+WEBAPP structure and it's symbolically linked as /var/tomcat6/webapps/docs
+(the link is part of SUNWtcat-examples packages).
 .RE
 
 .sp
@@ -104,6 +105,17 @@
 .ne 2
 .mk
 .na
+\fB\fB/var/tomcat6/logs/pid\fR\fR
+.ad
+.sp .6
+.RS 4n
+File where Tomcat which is started via SMF saves its PID number.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
 \fB\fB/var/tomcat6/temp/\fR\fR
 .ad
 .sp .6
@@ -126,6 +138,48 @@
 .ne 2
 .mk
 .na
+\fB\fB/var/tomcat6/webapps/ROOT/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Directory with default (ROOT) web application which is served when URL
+is requested without further path specifier (http://hostname/). After
+Tomcat package installation this directory is intentionally left empty
+with just index.jsp file. This JSP file redirects requester to Tomcat
+home page which is in ROOT.example/ directory. This shall allow
+better deployment of custom ROOT web application while maintain upgrade
+ability via packaging system (without loosing data).
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/tomcat6/webapps/ROOT.example/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Tomcat home web application (part of SUNWtcat-examples package).
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/tomcat6/webapps/examples/\fR\fR
+.ad
+.sp .6
+.RS 4n
+This directory contains web application with various ServLets and JSP
+examples. The directory is part of SUNWtcat-examples package which can
+be removed if it's required (to permanently disable this web
+application).
+.RE
+
+.sp
+.ne 2
+.mk
+.na
 \fB\fB/var/tomcat6/work/\fR\fR
 .ad
 .sp .6
@@ -152,6 +206,8 @@
 _
 SUNWtcatu
 _
+SUNWtcat-examples
+_
 Interface StabilityUncommitted
 .TE
 
--- a/usr/src/cmd/tomcat/build.properties.in	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/tomcat/build.properties.in	Sun Dec 20 07:12:51 2009 +0200
@@ -27,9 +27,9 @@
 # ----- Vesion Control Flags -----
 version.major=6
 version.minor=0
-version.build=0
+version.build=20
 version.patch=0
-version=6.0-snapshot
+version=6.0-20
 
 # ----- Proxy setup -----
 # Uncomment if using a proxy server
--- a/usr/src/cmd/tomcat/install-tomcat	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/tomcat/install-tomcat	Sun Dec 20 07:12:51 2009 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)install-tomcat	1.19	09/06/05 SMI"
+#ident	"@(#)install-tomcat	1.20	09/10/30 SMI"
 
 # functions - search for "START HERE" to find start of control flow
 
@@ -52,13 +52,19 @@
     cd ${ROOT}/etc
     rm -rf tomcat6
     ln -s ../var/tomcat${VERSION}/conf tomcat6
- 
+
     # move static stuff to usr and symlink it
     cd ${VARTOMCAT}/webapps
     find docs -depth -print | cpio -pdum ${USRTOMCAT}
     rm -rf docs
     ln -s ../../../usr/tomcat${VERSION}/docs docs
 
+    # move default web application to different location and install
+    # redirect jsp page (for possible altering of ROOT web app)
+    mv ROOT ROOT.example
+    mkdir ROOT
+    _install N ${TOP}/Solaris/index.jsp ${VARTOMCAT}/webapps/ROOT/index.jsp 644
+    
     # get rid of the MS-DOS files we don't need
     cd ${USRTOMCAT}/bin
     rm -r *.bat
--- a/usr/src/cmd/wireshark/METADATA	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/cmd/wireshark/METADATA	Sun Dec 20 07:12:51 2009 +0200
@@ -1,10 +1,10 @@
 NAME:             wireshark
-VERSION:          1.2.2
+VERSION:          1.2.3
 DESCRIPTION:      Wireshark Network protocol analyzer
 LICENSE:          GPLv3
 PACKAGE:          SUNWwireshark SUNWwiresharkr
 PROJECT_URL:      http://www.wireshark.org/
-SOURCE_DOWNLOAD:  http://media-2.cacetech.com/wireshark/src/wireshark-1.2.2.tar.bz2
+SOURCE_DOWNLOAD:  http://media-2.cacetech.com/wireshark/src/wireshark-1.2.3.tar.bz2
 SUPPORT:          Managed
 BUGTRAQ:          solaris/network/wireshark
 OSR:              12637
Binary file usr/src/cmd/wireshark/wireshark-1.2.2.tar.bz2 has changed
Binary file usr/src/cmd/wireshark/wireshark-1.2.3.tar.bz2 has changed
--- a/usr/src/lib/Makefile	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/lib/Makefile	Sun Dec 20 07:12:51 2009 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)Makefile	1.88	09/09/09 SMI"
+# ident	"@(#)Makefile	1.89	09/11/03 SMI"
 #
 
 #
@@ -200,6 +200,7 @@
 pyopenssl: openssl
 python26-pyopenssl: openssl
 qdox: junit
+trove: junit
 
 
 FRC:
--- a/usr/src/lib/libneon/METADATA	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/lib/libneon/METADATA	Sun Dec 20 07:12:51 2009 +0200
@@ -1,11 +1,21 @@
 NAME:             neon
-VERSION:          0.25.5
+VERSION:          0.29.0
 DESCRIPTION:      HTTP and WebDAV client library
-LICENSE:          GPLv2
+LICENSE:          LGPLv2
 PACKAGE:          SUNWneon
 PROJECT_URL:      http://www.webdav.org/neon/
-SOURCE_DOWNLOAD:  http://webdav.org/neon/neon-0.25.5.tar.gz
+SOURCE_DOWNLOAD:  http://webdav.org/neon/neon-0.29.0.tar.gz
 SUPPORT:          Managed
 BUGTRAQ:          solaris/utility/svn
 OSR:              4499
 COMMENTS:         
+
+===========================================================
+
+Security Advisories for libneon prior to 0.29.0:
+
+http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-2473
+http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-2474
+
+are satisfied by libneon 0.29.0.
+
--- a/usr/src/lib/libneon/Makefile.sfw	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/lib/libneon/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -19,140 +19,148 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.sfw	1.6	08/08/04 SMI"
+#ident	"@(#)Makefile.sfw	1.7	09/09/26 SMI"
 
 # This makefile is unusual, because it builds both 32 and 64 bit
 # versions of the library.  The builds occur in separate subdirs,
 # and 2 install scripts are used.
 
-VER=neon-0.25.5
+VER=neon-0.29.0
 VER64=$(VER)-64
 
 include ../Makefile.lib
 
 LARGEFILES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+LDFLAGS += -lsocket -lresolv -lnsl -lgen -z ignore
+LDFLAGS_32 = -L$(ROOT)/usr/lib -L/usr/lib -R/usr/lib
+LDFLAGS_32 += -m32 -s -z ignore
+LDFLAGS_64 = -L$(ROOT)/usr/lib/$(MACH64) -L/usr/lib/$(MACH64)
+LDFLAGS_64 += -R/usr/lib/$(MACH64)
+LDFLAGS_64 += -m64 -s -z ignore
+PKG_CONFIG_PATH_32 = /usr/lib/pkgconfig
+PKG_CONFIG_PATH_64 = /usr/lib/$(MACH64)/pkgconfig
+TOP = $(SRC)/lib/libneon
+DESTDIR = $(SRC)/lib/libneon/proto-$(MACH)
 
 all: real-all
 
 all32: $(VER)/config.status
-	(cd $(VER); env "CFLAGS=$(CFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
-	    "LD_OPTIONS=$(LDFLAGS) -M $(SRC)/cmd/mapfile_noexstk \
-	     -L$(ROOT)/usr/lib -L$(ROOT)/usr/sfw/lib" \
+	(cd $(VER); env - "CC=$(CC)" \
+	    "CFLAGS=$(CFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+	    "CPPFLAGS=$(CPPFLAGS)" \
+	    "CPP=$(CC) $(CPPFLAGS) $(CFLAGS) -E" \
+	    "LDFLAGS=$(LDFLAGS_32) $(LDFLAGS)" \
+	    "LD_OPTIONS=$(LDFLAGS_32) $(LDFLAGS) \
+	    -M $(SRC)/cmd/mapfile_noexstk" \
+	    "INSTALL=$(GINSTALL)" \
 	    PATH=$(SFW_PATH) \
-	    "MAKE=$(CCSMAKE)" $(CCSMAKE) -e)
+	    "MAKE=$(GMAKE)" $(GMAKE) )
 
 all64: $(VER64)/config.status
-	(cd $(VER64); env "CC=$(CC64)" \
+	(cd $(VER64); env - "CC=$(CC64)" \
+	    "CPPFLAGS=$(CPPFLAGS)" \
 	    "CFLAGS=$(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
-	    "LD_OPTIONS=$(LDFLAGS) -M $(SRC)/cmd/mapfile_noexstk \
-	     -L$(ROOT)/usr/lib/$(MACH64) -L$(ROOT)/usr/sfw/lib/$(MACH64)" \
+	    "CPPFLAGS=$(CPPFLAGS)" \
+	    "CPP=$(CC) $(CPPFLAGS) $(CFLAGS64) -E" \
+	    "LDFLAGS=$(LDFLAGS_64) $(LDFLAGS)" \
+	    "LD_OPTIONS=$(LDFLAGS_64) $(LDFLAGS) \
+	    -M $(SRC)/cmd/mapfile_noexstk" \
+	    "INSTALL=$(GINSTALL)" \
 	    PATH=$(SFW_PATH) \
-	    "MAKE=$(CCSMAKE)" $(CCSMAKE) -e)
-
-ROOTMAN=$(ROOT)/usr/share/man
-ROOTMAN1=$(ROOTMAN)/man1
-ROOTMAN3=$(ROOTMAN)/man3
+	    "MAKE=$(GMAKE)" $(GMAKE) )
 
-MAN1FILES=neon-config.1
-MAN3FILES=ne_add_request_header.3       ne_session_proxy.3 \
-	ne_addr_destroy.3             ne_set_error.3 \
-	ne_addr_error.3               ne_set_persist.3 \
-	ne_addr_first.3               ne_set_proxy_auth.3 \
-	ne_addr_next.3                ne_set_read_timeout.3 \
-	ne_addr_resolve.3             ne_set_request_body_buffer.3 \
-	ne_addr_result.3              ne_set_request_body_fd.3 \
-	ne_buffer.3                   ne_set_request_expect100.3 \
-	ne_buffer_altered.3           ne_set_server_auth.3 \
-	ne_buffer_append.3            ne_set_useragent.3 \
-	ne_buffer_clear.3             ne_shave.3 \
-	ne_buffer_concat.3            ne_sock_init.3 \
-	ne_buffer_create.3            ne_ssl_cert_cmp.3 \
-	ne_buffer_destroy.3           ne_ssl_cert_export.3 \
-	ne_buffer_finish.3            ne_ssl_cert_free.3 \
-	ne_buffer_grow.3              ne_ssl_cert_identity.3 \
-	ne_buffer_ncreate.3           ne_ssl_cert_import.3 \
-	ne_buffer_zappend.3           ne_ssl_cert_issuer.3 \
-	ne_calloc.3                   ne_ssl_cert_read.3 \
-	ne_close_connection.3         ne_ssl_cert_signedby.3 \
-	ne_forget_auth.3              ne_ssl_cert_subject.3 \
-	ne_get_error.3                ne_ssl_cert_write.3 \
-	ne_get_response_header.3      ne_ssl_clicert_decrypt.3 \
-	ne_get_scheme.3               ne_ssl_clicert_encrypted.3 \
-	ne_get_server_hostport.3      ne_ssl_clicert_free.3 \
-	ne_get_status.3               ne_ssl_clicert_name.3 \
-	ne_iaddr_cmp.3                ne_ssl_clicert_owner.3 \
-	ne_iaddr_free.3               ne_ssl_clicert_read.3 \
-	ne_iaddr_make.3               ne_ssl_dname_cmp.3 \
-	ne_iaddr_print.3              ne_ssl_readable_dname.3 \
-	ne_iaddr_typeof.3             ne_ssl_set_verify.3 \
-	ne_malloc.3                   ne_ssl_trust_cert.3 \
-	ne_oom_callback.3             ne_ssl_trust_default_ca.3 \
-	ne_print_request_header.3     ne_status.3 \
-	ne_qtoken.3                   ne_strdup.3 \
-	ne_realloc.3                  ne_strndup.3 \
-	ne_request_create.3           ne_token.3 \
-	ne_request_destroy.3          ne_version_match.3 \
-	ne_request_dispatch.3         ne_version_string.3 \
-	ne_response_header_iterate.3  ne_xml_create.3 \
-	ne_session_create.3           ne_xml_destroy.3 \
-	ne_session_destroy.3          neon.3
+# We want a thread-safe neon
+CFLAGS += -xc99=%all
+CFLAGS += -mt -D_REENTRANT -D__EXTENSIONS__
+CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS += -D_XPG6 -D_XOPEN_SOURCE=600 -D_POSIX_PTHREAD_SEMANTICS
+CFLAGS += -D_POSIX_C_SOURCE=200112L -D__XOPEN_OR_POSIX
 
+CFLAGS64 += -xc99=%all
+CFLAGS64 += -mt -D_REENTRANT -D__EXTENSIONS__
+CFLAGS64 += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS64 += -D_XPG6 -D_XOPEN_SOURCE=600 -D_POSIX_PTHREAD_SEMANTICS
+CFLAGS64 += -D_POSIX_C_SOURCE=200112L -D__XOPEN_OR_POSIX
 
-ROOTMAN1FILES = $(MAN1FILES:%=$(ROOTMAN1)/%)
-ROOTMAN3FILES = $(MAN3FILES:%=$(ROOTMAN3)/%)
+CPPFLAGS += -D_THREAD_SAFE -D_REENTRANT -D__EXTENSIONS__
+CPPFLAGS += -D_LARGEFILE_SOURCE
+CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_XPG6 -D_XOPEN_SOURCE=600
+CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_POSIX_C_SOURCE=200112L
+CPPFLAGS +=  -D__XOPEN_OR_POSIX
 
-install: all .WAIT install32 $(ROOTMAN1FILES) $(ROOTMAN3FILES) install64
+install: all .WAIT install32 install64
+	INSTDIR=$(DESTDIR) TOP=$(TOP) $(SH) ./install-sfw
+	INSTDIR=$(DESTDIR) TOP=$(TOP) MACH64=$(MACH64) $(SH) ./install-sfw-64
 
 install32:
-	(cd $(VER); env "LD_OPTIONS=$(LDFLAGS)" \
-	     PATH=$(SFW_PATH) \
-	     "MAKE=$(CCSMAKE)" \
-	     "DESTDIR=$(ROOT)" $(CCSMAKE) -e install-lib)
-	rm -f $(ROOT)/usr/lib/libneon.la
-	$(SRC)/tools/post_process_so $(ROOT)/usr/lib/libneon.so.25.0.5
-	(cd $(VER); env "DESTDIR=$(ROOT)" \
-	     PATH=$(SFW_PATH) \
-	     "MAKE=$(CCSMAKE)" \
-	 $(CCSMAKE) -e install-headers install-config install-html)
+	mkdir -p $(DESTDIR)
+	( cd $(VER); env "DESTDIR=$(DESTDIR)" \
+	     $(GMAKE) DESTDIR=$(DESTDIR) \
+	     INSTALL=$(GINSTALL) install )
 
 install64:
-	(cd $(VER64); env "LDFLAGS=$(LDFLAGS)" \
-	     PATH=$(SFW_PATH) \
-	     "MAKE=$(CCSMAKE)" "DESTDIR=$(ROOT)" \
-	     $(CCSMAKE) -e install-lib)
-	rm -f $(ROOT)/usr/lib/$(MACH64)/libneon.la
-	$(SRC)/tools/post_process_so \
-	    $(ROOT)/usr/lib/$(MACH64)/libneon.so.25.0.5
-
+	( cd $(VER64) ; env "DESTDIR=$(DESTDIR)" \
+	     $(GMAKE) DESTDIR=$(DESTDIR) \
+	     INSTALL=$(GINSTALL) install-lib install-config )
 
 real-all: all32 all64
 
 $(VER)/config.status: $(VER)/configure
-	(cd $(VER); \
-	    env "CC=$(CC)" "CFLAGS=$(CFLAGS)" \
-	    "LD_OPTIONS=$(LDFLAGS) -L$(ROOT)/usr/lib -L$(ROOT)/usr/sfw/lib" \
-	    "INSTALL=/usr/ucb/install -c" \
+	( cd $(VER) ; \
+	    env - "CC=$(CC)" \
+	    "CPPFLAGS=$(CPPFLAGS)" \
+	    "CFLAGS=$(CFLAGS)" \
+	    "LDFLAGS=$(LDFLAGS_32) $(LDFLAGS)" \
+	    "LD_OPTIONS=$(LDFLAGS_32) $(LDFLAGS)" \
+	    "INSTALL=$(GINSTALL)" \
+	    "CPP=$(CC) $(CPPFLAGS) $(CFLAGS) -E" \
 	    PATH=$(SFW_PATH) \
-	    "MAKE=$(CCSMAKE)" \
-	    ./configure --prefix=/usr --disable-static --enable-shared \
-	    --with-ssl --mandir=/usr/share/man --with-libxml2)
+	    "MAKE=$(GMAKE)" \
+	    "PKG_CONFIG_PATH=$(PKG_CONFIG_PATH_32)" \
+	    ./configure --prefix=/usr \
+	    --mandir=/usr/share/man \
+	    --enable-shared \
+	    --disable-static \
+	    --enable-webdav \
+	    --enable-threadsafe-ssl=posix \
+	    --enable-nls \
+	    --disable-warnings \
+	    --disable-ld-version-script \
+	    --with-zlib \
+	    --with-ssl=openssl \
+	    --with-libproxy \
+	    --with-libxml2 )
 
 $(VER64)/config.status: $(VER64)/configure
-	(cd $(VER64); \
-	    env "CC=$(CC64)" "CFLAGS=$(CFLAGS64)" \
-	    "LD_OPTIONS=$(LDFLAGS) -L$(ROOT)/usr/lib/$(MACH64) -L$(ROOT)/usr/sfw/lib/$(MACH64)" \
-	    "INSTALL=/usr/ucb/install -c" \
-	    "LDFLAGS=$(LDFLAGS) -L$(ROOT)/usr/lib/$(MACH64) \
-	     -L$(ROOT)/usr/sfw/lib/$(MACH64) -L/usr/sfw/lib/$(MACH64) \
-	    -R/usr/sfw/lib/$(MACH64)" \
+	( cd $(VER64); \
+	    env - "CC=$(CC64)" \
+	    "CPPFLAGS=$(CPPFLAGS)" \
+	    "CFLAGS=$(CFLAGS64)" \
+	    "LDFLAGS=$(LDFLAGS_64) $(LDFLAGS)" \
+	    "LD_OPTIONS=$(LDFLAGS_64) $(LDFLAGS)" \
+	    "INSTALL=$(GINSTALL)" \
+	    "CPP=$(CC) $(CPPFLAGS) $(CFLAGS64) -E" \
 	    PATH=$(SFW_PATH) \
-	    "MAKE=$(CCSMAKE)" \
-	    ./configure --prefix=/usr --disable-static --enable-shared \
-	    --libdir=/usr/lib/$(MACH64) --with-ssl --mandir=/usr/share/man \
-	    --with-libxml2)
+	    "MAKE=$(GMAKE)" \
+	    "PKG_CONFIG_PATH=$(PKG_CONFIG_PATH_64)" \
+	    ./configure --prefix=/usr \
+	    --bindir=/usr/bin/$(MACH64) \
+	    --libdir=/usr/lib/$(MACH64) \
+	    --mandir=/usr/share/man \
+	    --enable-shared \
+	    --disable-static \
+	    --enable-webdav \
+	    --enable-threadsafe-ssl=posix \
+	    --enable-nls \
+	    --disable-warnings \
+	    --disable-ld-version-script \
+	    --with-zlib \
+	    --with-ssl=openssl \
+	    --without-libproxy \
+	    --with-libxml2 )
 
 $(VER)/configure: $(VER).tar.gz
 	mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
@@ -165,15 +173,9 @@
 	touch $(VER64)/configure
 
 clean:
-	-rm -rf $(VER)
-	-rm -rf $(VER64)
+	-rm -rf $(VER) $(VER64) $(DESTDIR)
 
 install_h:
 
 include ../Makefile.targ
 
-$(ROOTMAN3)/%: $(VER)/doc/man/% sunman.sed
-	$(SED) -f sunman.sed $< > $@
-
-$(ROOTMAN1)/%: $(VER)/doc/man/% sunman.sed
-	$(SED) -f sunman.sed $< > $@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libneon/install-sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,269 @@
+#!/bin/bash
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)install-sfw	1.1	09/09/24 SMI"
+
+VERS=neon-0.29.0
+
+GSED=/usr/bin/gsed
+PREFIX=${ROOT}/usr
+BINDIR=${PREFIX}/bin
+LIBDIR=${PREFIX}/lib
+PKGCONFIGDIR=${LIBDIR}/pkgconfig
+INCLUDEDIR=${PREFIX}/include/neon
+LOCALEDIR=${PREFIX}/share/locale
+MAN1DIR=${PREFIX}/share/man/man1
+MAN3DIR=${PREFIX}/share/man/man3
+ROOTMAN1DIR=${MAN1DIR}
+ROOTMAN3DIR=${MAN3DIR}
+HTMLDOCLIBDIR=${PREFIX}/share/doc/neon-0.29.0/html
+
+MANSCRIPT=${TOP}/sunman.sed
+. ${SRC}/tools/install.subr
+
+for file in \
+    "ne_add_request_header.3" \
+    "ne_addr_destroy.3" \
+    "ne_addr_error.3" \
+    "ne_addr_first.3" \
+    "ne_addr_next.3" \
+    "ne_addr_resolve.3" \
+    "ne_addr_result.3" \
+    "ne_buffer.3" \
+    "ne_buffer_altered.3" \
+    "ne_buffer_append.3" \
+    "ne_buffer_clear.3" \
+    "ne_buffer_concat.3" \
+    "ne_buffer_create.3" \
+    "ne_buffer_destroy.3" \
+    "ne_buffer_finish.3" \
+    "ne_buffer_grow.3" \
+    "ne_buffer_ncreate.3" \
+    "ne_buffer_zappend.3" \
+    "ne_calloc.3" \
+    "ne_close_connection.3" \
+    "ne_forget_auth.3" \
+    "ne_get_error.3" \
+    "ne_get_request_flag.3" \
+    "ne_get_response_header.3" \
+    "ne_get_scheme.3" \
+    "ne_get_server_hostport.3" \
+    "ne_get_session_flag.3" \
+    "ne_get_status.3" \
+    "ne_has_support.3" \
+    "ne_i18n_init.3" \
+    "ne_iaddr_cmp.3" \
+    "ne_iaddr_free.3" \
+    "ne_iaddr_make.3" \
+    "ne_iaddr_print.3" \
+    "ne_iaddr_typeof.3" \
+    "ne_malloc.3" \
+    "ne_oom_callback.3" \
+    "ne_print_request_header.3" \
+    "ne_qtoken.3" \
+    "ne_realloc.3" \
+    "ne_request_create.3" \
+    "ne_request_destroy.3" \
+    "ne_request_dispatch.3" \
+    "ne_response_header_iterate.3" \
+    "ne_session_create.3" \
+    "ne_session_destroy.3" \
+    "ne_session_proxy.3" \
+    "ne_set_connect_timeout.3" \
+    "ne_set_error.3" \
+    "ne_set_proxy_auth.3" \
+    "ne_set_read_timeout.3" \
+    "ne_set_request_body_buffer.3" \
+    "ne_set_request_body_fd.3" \
+    "ne_set_request_body_fd64.3" \
+    "ne_set_request_flag.3" \
+    "ne_set_server_auth.3" \
+    "ne_set_session_flag.3" \
+    "ne_set_useragent.3" \
+    "ne_shave.3" \
+    "ne_sock_exit.3" \
+    "ne_sock_init.3" \
+    "ne_ssl_cert_cmp.3" \
+    "ne_ssl_cert_export.3" \
+    "ne_ssl_cert_free.3" \
+    "ne_ssl_cert_identity.3" \
+    "ne_ssl_cert_import.3" \
+    "ne_ssl_cert_issuer.3" \
+    "ne_ssl_cert_read.3" \
+    "ne_ssl_cert_signedby.3" \
+    "ne_ssl_cert_subject.3" \
+    "ne_ssl_cert_write.3" \
+    "ne_ssl_clicert_decrypt.3" \
+    "ne_ssl_clicert_encrypted.3" \
+    "ne_ssl_clicert_free.3" \
+    "ne_ssl_clicert_name.3" \
+    "ne_ssl_clicert_owner.3" \
+    "ne_ssl_clicert_read.3" \
+    "ne_ssl_dname_cmp.3" \
+    "ne_ssl_readable_dname.3" \
+    "ne_ssl_set_verify.3" \
+    "ne_ssl_trust_cert.3" \
+    "ne_ssl_trust_default_ca.3" \
+    "ne_status.3" \
+    "ne_strdup.3" \
+    "ne_strndup.3" \
+    "ne_token.3" \
+    "ne_version_match.3" \
+    "ne_version_string.3" \
+    "ne_xml_create.3" \
+    "ne_xml_destroy.3" \
+    "neon.3"
+do
+    _install M ${INSTDIR}/usr/share/man/man3/${file} ${MAN3DIR}/${file} 0644
+done
+
+for file in \
+    "neon-config.1"
+do
+    _install M ${INSTDIR}/usr/share/man/man1/${file} ${MAN1DIR}/${file} 0644
+done
+
+cd ${TOP}
+
+for file in \
+    "cs" \
+    "de" \
+    "fr" \
+    "ja" \
+    "nn" \
+    "pl" \
+    "ru" \
+    "tr" \
+    "zh_CN"
+do
+    _install N ${INSTDIR}/usr/share/locale/${file}/LC_MESSAGES/neon.mo ${LOCALEDIR}/${file}/LC_MESSAGES/neon.mo 0644
+done
+
+for file in \
+    "api.html" \
+    "biblio.html" \
+    "compliance.html" \
+    "features.html" \
+    "index.html" \
+    "intro.html" \
+    "ref.html" \
+    "refalloc.html" \
+    "refauth.html" \
+    "refbuf.html" \
+    "refbufapp.html" \
+    "refbufcr.html" \
+    "refbufdest.html" \
+    "refbufutil.html" \
+    "refcert.html" \
+    "refclicert.html" \
+    "refconfig.html" \
+    "referr.html" \
+    "reffeat.html" \
+    "refgetst.html" \
+    "refi18n.html" \
+    "refiaddr.html" \
+    "refneon.html" \
+    "refopts.html" \
+    "refreq.html" \
+    "refreqbody.html" \
+    "refreqflags.html" \
+    "refreqhdr.html" \
+    "refresolve.html" \
+    "refresphdr.html" \
+    "refsess.html" \
+    "refsessflags.html" \
+    "refshave.html" \
+    "refsockinit.html" \
+    "refsslca.html" \
+    "refsslcert2.html" \
+    "refsslcertio.html" \
+    "refssldname.html" \
+    "refsslvfy.html" \
+    "refstatus.html" \
+    "reftok.html" \
+    "refvers.html" \
+    "refxml.html" \
+    "security.html" \
+    "using.html" \
+    "xml.html"
+do
+    _install N ${INSTDIR}/usr/share/doc/neon-0.29.0/html/${file} ${HTMLDOCLIBDIR}/${file} 0644
+done
+
+for file in \
+    "ne_207.h" \
+    "ne_acl.h" \
+    "ne_acl3744.h" \
+    "ne_alloc.h" \
+    "ne_auth.h" \
+    "ne_basic.h" \
+    "ne_compress.h" \
+    "ne_dates.h" \
+    "ne_defs.h" \
+    "ne_i18n.h" \
+    "ne_locks.h" \
+    "ne_md5.h" \
+    "ne_pkcs11.h" \
+    "ne_props.h" \
+    "ne_redirect.h" \
+    "ne_request.h" \
+    "ne_session.h" \
+    "ne_socket.h" \
+    "ne_ssl.h" \
+    "ne_string.h" \
+    "ne_uri.h" \
+    "ne_utils.h" \
+    "ne_xml.h" \
+    "ne_xmlreq.h"
+do
+    _install N ${INSTDIR}/usr/include/neon/${file} ${INCLUDEDIR}/${file} 0644
+done
+
+_install N ${INSTDIR}/usr/bin/neon-config ${BINDIR}/neon-config 0755
+
+cd ${INSTDIR}/usr/lib/pkgconfig
+
+${GSED} -e "s#-R/lib ##g" neon.pc > neon.pc.sed
+cp -fp neon.pc.sed neon.pc
+${GSED} -e "s#-L/lib ##g" neon.pc > neon.pc.sed
+cp -fp neon.pc.sed neon.pc
+${GSED} -e "s#-R/usr/lib ##g" neon.pc > neon.pc.sed
+cp -fp neon.pc.sed neon.pc
+rm -f neon.pc.sed
+
+cd ${TOP}
+
+_install N ${INSTDIR}/usr/lib/pkgconfig/neon.pc ${PKGCONFIGDIR}/neon.pc 0644
+
+# because libtool is being 'helpful' with the RUNPATH
+elfedit -e 'dyn:delete RUNPATH' ${INSTDIR}/usr/lib/libneon.so.27.2.0
+elfedit -e 'dyn:delete RPATH' ${INSTDIR}/usr/lib/libneon.so.27.2.0
+
+_install D ${INSTDIR}/usr/lib/libneon.so.27.2.0 ${LIBDIR}/libneon.so.27.2.0 0755
+_install L libneon.so.27.2.0 ${LIBDIR}/libneon.so.27
+_install L libneon.so.27.2.0 ${LIBDIR}/libneon.so
+
+exit 0
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libneon/install-sfw-64	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,61 @@
+#!/bin/bash
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)install-sfw-64	1.1	09/09/24 SMI"
+
+VERS=neon-0.29.0-64
+
+PREFIX=${ROOT}/usr
+LIBDIR=${PREFIX}/lib/${MACH64}
+PKGCONFIGDIR=${LIBDIR}/pkgconfig
+
+. ${SRC}/tools/install.subr
+
+GSED=/usr/bin/gsed
+
+cd ${INSTDIR}/usr/lib/${MACH64}/pkgconfig
+
+${GSED} -e "s#-R/lib ##g" neon.pc > neon.pc.sed
+cp -fp neon.pc.sed neon.pc
+${GSED} -e "s#-L/lib ##g" neon.pc > neon.pc.sed
+cp -fp neon.pc.sed neon.pc
+${GSED} -e "s#-R/usr/lib ##g" neon.pc > neon.pc.sed
+cp -fp neon.pc.sed neon.pc
+rm -f neon.pc.sed
+
+cd ${TOP}
+
+_install N ${INSTDIR}/usr/lib/${MACH64}/pkgconfig/neon.pc ${PKGCONFIGDIR}/neon.pc 0444
+
+# because libtool is being 'helpful' with the RUNPATH
+elfedit -e 'dyn:delete RUNPATH' ${INSTDIR}/usr/lib/${MACH64}/libneon.so.27.2.0
+elfedit -e 'dyn:delete RPATH' ${INSTDIR}/usr/lib/${MACH64}/libneon.so.27.2.0
+
+_install D ${INSTDIR}/usr/lib/${MACH64}/libneon.so.27.2.0 ${LIBDIR}/libneon.so.27.2.0 0755
+_install L libneon.so.27.2.0 ${LIBDIR}/libneon.so.27
+_install L libneon.so.27.2.0 ${LIBDIR}/libneon.so
+
+exit 0
+
Binary file usr/src/lib/libneon/neon-0.25.5.tar.gz has changed
Binary file usr/src/lib/libneon/neon-0.29.0.tar.gz has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/Makefile.com	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,98 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"@(#)Makefile.com	1.1	09/11/05 SMI"
+
+METAINFO_FILE = ../METADATA
+VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
+VER64 =$(VER)-64
+
+TARBALL = ../$(VER).tar.gz
+
+GPATCH_FLAGS = -p1
+
+PKCS11_LIB = /usr/lib/libpkcs11.so.1
+PKCS11_LIB64 = /usr/lib/64/libpkcs11.so.1
+
+CFLAGS = -DSOLARIS_OPENSSL -DNO_WINDOWS_BRAINDEATH
+CFLAGS64 = $(CFLAGS)
+
+GENERIC_CONFIGURE_OPTIONS = \
+	$(CFLAGS) \
+	--openssldir=/etc/openssl \
+	--prefix=/usr \
+	--install_prefix=$(ROOT) \
+ 	no-ec \
+	no-ecdh \
+	no-ecdsa \
+	no-rc3 \
+	no-rc5 \
+	no-mdc2 \
+	no-idea \
+	no-hw_4758_cca \
+	no-hw_aep \
+	no-hw_atalla \
+	no-hw_chil \
+	no-hw_gmp \
+	no-hw_ncipher \
+	no-hw_nuron \
+	no-hw_padlock \
+	no-hw_sureware \
+	no-hw_ubsec \
+ 	no-hw_cswift \
+	threads \
+	shared
+
+CONFIGURE_OPTIONS64_i386 = solaris64-x86_64-cc-sunw
+CONFIGURE_OPTIONS64_sparc = solaris64-sparcv9-cc-sunw
+CONFIGURE_OPTIONS64 = $(GENERIC_CONFIGURE_OPTIONS) \
+		$(CONFIGURE_OPTIONS64_$(MACH)) \
+		--pk11-libname=$(PKCS11_LIB64)
+			
+CONFIGURE_OPTIONS_i386 = 386 solaris-x86-cc-sunw
+CONFIGURE_OPTIONS_sparc = solaris-sparcv8-cc-sunw
+CONFIGURE_OPTIONS = $(GENERIC_CONFIGURE_OPTIONS) \
+		$(CONFIGURE_OPTIONS_$(MACH)) \
+		--pk11-libname=$(PKCS11_LIB)
+
+# The PKCS#11 engine itself is written in separate files. We expect
+# further development of the engine so we do not patch those files into
+# existence but manually copy them where they belong. That way we will
+# not have to examine diffs of diffs when code reviewing new engine
+# changes.
+PKCS11_STAMP = pkcs11_engine.stamp
+PKCS11_LOC = ../Patches/pkcs11-engine
+PKCS11_SRC = hw_pk11.c \
+	     hw_pk11_err.c \
+	     hw_pk11_err.h \
+	     hw_pk11_pub.c
+
+PKCS11_FILES = $(PKCS11_SRC:%=$(PKCS11_LOC)/%)
+
+%/$(PKCS11_STAMP): $(PKCS11_FILES)
+	$(CP) -fp $? $(@D)/crypto/engine
+	$(TOUCH) $@
+
--- a/usr/src/lib/openssl/Makefile.sfw	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/lib/openssl/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -24,170 +24,23 @@
 # Use is subject to license terms.
 #
 
-# ident	"@(#)Makefile.sfw	1.5	09/08/27 SMI"
-
-VER =$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
-TARBALL =$(VER).tar.gz
-VER64 =$(VER)-64
-
-PKCS11_LIB = /usr/lib/libpkcs11.so.1
-PKCS11_LIB64 = /usr/lib/64/libpkcs11.so.1
+# ident	"@(#)Makefile.sfw	1.6	09/11/05 SMI"
 
 include ../Makefile.lib
 
-CFLAGS = -DSOLARIS_OPENSSL -DNO_WINDOWS_BRAINDEATH
-CFLAGS64 = -DSOLARIS_OPENSSL -DNO_WINDOWS_BRAINDEATH
-
-LDFLAGS += -L$(ROOT)/usr/lib
-LDFLAGS += -L$(PREFIX)/lib -R$(PREFIX)/lib
-
-LINTFLAGS += -I./include
-LINTFLAGS64 += -I./include -m64
-
-GPATCH_FLAGS = -p1
-
-# The following patches only apply to the 32bit x86 built target
-PATCHES_i386:sh = echo Patches/i386*.patch
-PATCHES_32 = $(PATCHES_$(MACH))
-
-PATCHES:sh = echo Patches/[0-2][0-9]*.patch
-PKCS11_ENGINE_FILES:sh = echo Patches/pkcs11-engine/*.[ch]
-
-GENERIC_CONFIGURE_OPTIONS = \
-	--openssldir=/etc/openssl \
-	--prefix=/usr \
-	--install_prefix=$(ROOT) \
- 	no-ec \
-	no-ecdh \
-	no-ecdsa \
-	no-rc3 \
-	no-rc5 \
-	no-mdc2 \
-	no-idea \
-	no-hw_4758_cca \
-	no-hw_aep \
-	no-hw_atalla \
-	no-hw_chil \
-	no-hw_gmp \
-	no-hw_ncipher \
-	no-hw_nuron \
-	no-hw_padlock \
-	no-hw_sureware \
-	no-hw_ubsec \
- 	no-hw_cswift \
-	threads \
-	shared
-
-CONFIGURE_OPTIONS64_i386 = solaris64-x86_64-cc-sunw
-CONFIGURE_OPTIONS64_sparc = solaris64-sparcv9-cc-sunw
-CONFIGURE_OPTIONS64 = $(GENERIC_CONFIGURE_OPTIONS) \
-		$(CONFIGURE_OPTIONS64_$(MACH)) \
-		--pk11-libname=$(PKCS11_LIB64)
-			
-
-CONFIGURE_OPTIONS_i386 = 386 solaris-x86-cc-sunw
-CONFIGURE_OPTIONS_sparc = solaris-sparcv8-cc-sunw
-CONFIGURE_OPTIONS = $(GENERIC_CONFIGURE_OPTIONS) \
-		$(CONFIGURE_OPTIONS_$(MACH)) \
-		--pk11-libname=$(PKCS11_LIB)
-
-# Configure usually creates this file after it finishes. It does not do that
-# when configuring OpenSSL but we follow this convention and touch it ourselves
-# when Configure is done. It is needed so that incremental build does not
-# rebuild everything.
-CONFIG_STATUS = config.status
-
-all: all32 all64
-
-all32: $(VER)/$(CONFIG_STATUS) lint32
-	(cd $(VER); env - \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
-	$(CCSMAKE))
-
-all64: $(VER64)/$(CONFIG_STATUS) lint64
-	(cd $(VER64); env - \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
-	$(CCSMAKE))
+SUBDIRS = fips non-fips
 
-# opensslconf.h is patched to ensure suitability for both 64bit and 32bit
-install32: all32
-	(cd $(VER); env - \
-	DESTDIR=$(ROOT) \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
-	$(CCSMAKE) install_sw)
-	VERS=$(VER) $(SHELL) ./install-sfw
-
-install64: all64
-	for pkg in $(COMPONENT_PACKAGES:sh); do \
-		$(SRC)/tools/protofix --pkg $$pkg --perm --write ; \
-	done
-	(cd $(VER64); env - \
-	DESTDIR=$(ROOT) \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
-	$(CCSMAKE) install_sw)
-	MACH64=$(MACH64) VERS=$(VER64) $(SHELL) ./install-sfw-64
-
-install_docs: install32
-	(cd $(VER); env - \
-	DESTDIR=$(ROOT) \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
-	$(CCSMAKE) MANDIR=/usr/share/man install_docs)
-
-# Note the order *is* the install64 is done first so that install-sfw-64
-# can move the libraries and binaries "down" into the $(MACH64) subdir
-# so that they don't get trampeled on by the install32 build (or vice versa).
-install: all install64 install32 install_docs
-	for pkg in $(COMPONENT_PACKAGES:sh) ; do \
-		$(SRC)/tools/protofix --pkg $$pkg --perm ; \
-	done
+all := TARGET = all
+all32 := TARGET = all32
+all64 := TARGET = all64
+lint := TARGET = lint
+install := TARGET = install
+clean := TARGET = clean
 
-$(VER)/$(CONFIG_STATUS): $(VER)/$(SFW_STAMP_PATCHED) $(PKCS11_ENGINE_FILES)
-	# The PKCS#11 engine itself is written in separate files. We expect
-	# further development of the engine so we do not patch those files into
-	# existence but manually copy them where they belong. That way we will
-	# not have to examine diffs of diffs when code reviewing new engine
-	# changes.
-	($(CP) -p Patches/pkcs11-engine/*.[ch] $(VER)/crypto/engine)
-	(cd $(VER); env - \
-	CC=$(CC) \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
-	PERL=$(PERL) \
-	$(SHELL) ./Configure $(CFLAGS) $(CONFIGURE_OPTIONS))
-	$(GPATCH) $(VER)/crypto/opensslconf.h Patches/opensslconf.patch
-	$(TOUCH) $@
-	(cd $(VER); $(CCSMAKE) depend)
+all all32 all64 lint install clean: $(SUBDIRS)
 
-$(VER64)/$(CONFIG_STATUS): $(VER64)/$(SFW_STAMP_PATCHED) $(PKCS11_ENGINE_FILES)
-	# See the comment with the 32 bit version target as to why we manually
-	# copy those files.
-	($(CP) -p Patches/pkcs11-engine/*.[ch] $(VER64)/crypto/engine)
-	(cd $(VER64); env - \
-	CC=$(CC64) \
-	PATH=$(SFW_PATH) \
-	MAKE=$(CCSMAKE) \
-	PERL=$(PERL) \
-	$(SHELL) ./Configure $(CFLAGS64) $(CONFIGURE_OPTIONS64))
-	$(TOUCH) $@
-	(cd $(VER64); $(CCSMAKE) depend)
-
-lint32: $(VER)/$(CONFIG_STATUS)
-	(cd $(VER); \
-		$(LINT.c) -o crypto ../llib-lcrypto > $(LINTOUT) 2>&1; \
-		$(LINT.c) -o ssl ../llib-lssl > $(LINTOUT) 2>&1)
-
-lint64: $(VER64)/$(CONFIG_STATUS)
-	(cd $(VER64); \
-		$(LINT64.c) -o crypto ../llib-lcrypto > $(LINTOUT) 2>&1; \
-		$(LINT64.c) -o ssl ../llib-lssl > $(LINTOUT) 2>&1)
-
-clean:	
-	-rm -rf $(VER) $(VER64)
+$(SUBDIRS): FRC.targ
+	@cd $@; pwd; $(MAKE) $(MAKEFILE) $(TARGET)
 
 install_h:
 
--- a/usr/src/lib/openssl/Patches/24-6850304.patch	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/lib/openssl/Patches/24-6850304.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -1,9 +1,17 @@
 diff -ruN openssl-0.9.8k/crypto/opensslv.h openssl-0.9.8k/crypto/opensslv.h
 --- openssl-0.9.8k/crypto/opensslv.h	2009-03-25 13:08:14.000000000 +0100
-+++ openssl-0.9.8k/crypto/opensslv.h	2009-07-30 18:40:40.606780844 +0200
-@@ -29,7 +29,12 @@
++++ openssl-0.9.8k/crypto/opensslv.h	2009-08-12 13:37:46.187163540 +0200
+@@ -27,9 +27,19 @@
+  */
+ #define OPENSSL_VERSION_NUMBER	0x009080bfL
  #ifdef OPENSSL_FIPS
- #define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8k-fips 25 Mar 2009"
+-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8k-fips 25 Mar 2009"
++#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8k-fips 25 Mar 2009 " \
++	"(+ security fixes for:" \
++	" CVE-2009-1377" \
++	" CVE-2009-1378" \
++	" CVE-2009-1379" \
++	")"
  #else
 -#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8k 25 Mar 2009"
 +#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8k 25 Mar 2009 " \
@@ -17,7 +25,7 @@
  
 diff -ruN openssl-0.9.8k/crypto/pqueue/pqueue.c openssl-0.9.8k/crypto/pqueue/pqueue.c
 --- openssl-0.9.8k/crypto/pqueue/pqueue.c	2005-06-28 14:53:33.000000000 +0200
-+++ openssl-0.9.8k/crypto/pqueue/pqueue.c	2009-07-30 16:54:10.719219778 +0200
++++ openssl-0.9.8k/crypto/pqueue/pqueue.c	2009-08-12 13:37:06.692776046 +0200
 @@ -234,3 +234,17 @@
  
  	return ret;
@@ -38,7 +46,7 @@
 +}
 diff -ruN openssl-0.9.8k/crypto/pqueue/pqueue.h openssl-0.9.8k/crypto/pqueue/pqueue.h
 --- openssl-0.9.8k/crypto/pqueue/pqueue.h	2005-05-31 00:34:27.000000000 +0200
-+++ openssl-0.9.8k/crypto/pqueue/pqueue.h	2009-07-30 16:54:10.719408736 +0200
++++ openssl-0.9.8k/crypto/pqueue/pqueue.h	2009-08-12 13:37:06.692968250 +0200
 @@ -91,5 +91,6 @@
  pitem *pqueue_next(piterator *iter);
  
@@ -48,7 +56,7 @@
  #endif /* ! HEADER_PQUEUE_H */
 diff -ruN openssl-0.9.8k/ssl/d1_both.c openssl-0.9.8k/ssl/d1_both.c
 --- openssl-0.9.8k/ssl/d1_both.c	2007-10-17 23:17:49.000000000 +0200
-+++ openssl-0.9.8k/ssl/d1_both.c	2009-07-30 16:58:04.171570758 +0200
++++ openssl-0.9.8k/ssl/d1_both.c	2009-08-12 13:37:06.693525453 +0200
 @@ -519,6 +519,7 @@
  
  	if ( s->d1->handshake_read_seq == frag->msg_header.seq)
@@ -86,7 +94,7 @@
  
 diff -ruN openssl-0.9.8k/ssl/d1_pkt.c openssl-0.9.8k/ssl/d1_pkt.c
 --- openssl-0.9.8k/ssl/d1_pkt.c	2008-10-13 08:43:06.000000000 +0200
-+++ openssl-0.9.8k/ssl/d1_pkt.c	2009-07-30 16:54:10.720570557 +0200
++++ openssl-0.9.8k/ssl/d1_pkt.c	2009-08-12 13:37:06.694128696 +0200
 @@ -167,6 +167,10 @@
      DTLS1_RECORD_DATA *rdata;
  	pitem *item;
--- a/usr/src/lib/openssl/Patches/25-6881996.patch	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/lib/openssl/Patches/25-6881996.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -1,6 +1,6 @@
 diff -ruN ../a/openssl-0.9.8k/CHANGES openssl-0.9.8k/CHANGES
---- ../a/openssl-0.9.8k/CHANGES	2009-03-25 03:46:55.000000000 -0700
-+++ openssl-0.9.8k/CHANGES	2009-10-05 14:58:27.131290179 -0700
+--- ../a/openssl-0.9.8k/CHANGES	2009-03-25 11:46:55.000000000 +0100
++++ openssl-0.9.8k/CHANGES	2009-10-14 17:14:10.064846541 +0200
 @@ -2,6 +2,13 @@
   OpenSSL CHANGES
   _______________
@@ -16,8 +16,8 @@
  
    *) Don't set val to NULL when freeing up structures, it is freed up by
 diff -ruN ../a/openssl-0.9.8k/crypto/evp/c_alld.c openssl-0.9.8k/crypto/evp/c_alld.c
---- ../a/openssl-0.9.8k/crypto/evp/c_alld.c	2005-04-30 14:51:40.000000000 -0700
-+++ openssl-0.9.8k/crypto/evp/c_alld.c	2009-10-05 14:58:27.139011742 -0700
+--- ../a/openssl-0.9.8k/crypto/evp/c_alld.c	2005-04-30 23:51:40.000000000 +0200
++++ openssl-0.9.8k/crypto/evp/c_alld.c	2009-10-14 17:14:10.065117156 +0200
 @@ -64,9 +64,6 @@
  
  void OpenSSL_add_all_digests(void)
@@ -29,9 +29,17 @@
  	EVP_add_digest(EVP_md4());
  #endif
 diff -ruN ../a/openssl-0.9.8k/crypto/opensslv.h openssl-0.9.8k/crypto/opensslv.h
---- ../a/openssl-0.9.8k/crypto/opensslv.h	2009-10-05 15:32:36.329125471 -0700
-+++ openssl-0.9.8k/crypto/opensslv.h	2009-10-05 15:34:36.847601425 -0700
-@@ -34,6 +34,7 @@
+--- ../a/openssl-0.9.8k/crypto/opensslv.h	2009-10-14 17:13:51.667902897 +0200
++++ openssl-0.9.8k/crypto/opensslv.h	2009-10-14 17:14:28.797866461 +0200
+@@ -32,6 +32,7 @@
+ 	" CVE-2009-1377" \
+ 	" CVE-2009-1378" \
+ 	" CVE-2009-1379" \
++	" CVE-2009-2409" \
+ 	")"
+ #else
+ #define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8k 25 Mar 2009 " \
+@@ -39,6 +40,7 @@
  	" CVE-2009-1377" \
  	" CVE-2009-1378" \
  	" CVE-2009-1379" \
@@ -40,8 +48,8 @@
  #endif
  #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 diff -ruN ../a/openssl-0.9.8k/crypto/x509/x509_vfy.c openssl-0.9.8k/crypto/x509/x509_vfy.c
---- ../a/openssl-0.9.8k/crypto/x509/x509_vfy.c	2008-07-13 07:33:15.000000000 -0700
-+++ openssl-0.9.8k/crypto/x509/x509_vfy.c	2009-10-05 14:58:27.137612533 -0700
+--- ../a/openssl-0.9.8k/crypto/x509/x509_vfy.c	2008-07-13 16:33:15.000000000 +0200
++++ openssl-0.9.8k/crypto/x509/x509_vfy.c	2009-10-14 17:14:10.065926671 +0200
 @@ -986,7 +986,11 @@
  	while (n >= 0)
  		{
@@ -70,8 +78,8 @@
  				ctx->error=X509_V_ERR_CERT_SIGNATURE_FAILURE;
  				ctx->current_cert=xs;
 diff -ruN ../a/openssl-0.9.8k/ssl/ssl_algs.c openssl-0.9.8k/ssl/ssl_algs.c
---- ../a/openssl-0.9.8k/ssl/ssl_algs.c	2007-04-23 16:50:21.000000000 -0700
-+++ openssl-0.9.8k/ssl/ssl_algs.c	2009-10-05 14:58:27.140351704 -0700
+--- ../a/openssl-0.9.8k/ssl/ssl_algs.c	2007-04-24 01:50:21.000000000 +0200
++++ openssl-0.9.8k/ssl/ssl_algs.c	2009-10-14 17:14:10.066124834 +0200
 @@ -92,9 +92,6 @@
  	EVP_add_cipher(EVP_seed_cbc());
  #endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/Patches/25-fips_rand.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,12 @@
+diff -ruN a/openssl-0.9.8k/fips/rand/fips_rand.h b/openssl-0.9.8k/fips/rand/fips_rand.h
+--- openssl-0.9.8k/fips/rand/fips_rand.h	2008-09-16 12:12:18.000000000 +0200
++++ openssl-0.9.8k/fips/rand/fips_rand.h	2009-09-29 17:42:41.969816617 +0200
+@@ -50,7 +50,7 @@
+ #ifndef HEADER_FIPS_RAND_H
+ #define HEADER_FIPS_RAND_H
+ 
+-#include "des.h"
++#include <openssl/des.h>
+ 
+ #ifdef OPENSSL_FIPS
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/Patches/26-openssl_fips.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,123 @@
+diff -ruN ../a/openssl-0.9.8k/apps/openssl.c openssl-0.9.8k/apps/openssl.c
+--- ../a/openssl-0.9.8k/apps/openssl.c	2008-09-16 00:24:39.000000000 +0200
++++ openssl-0.9.8k/apps/openssl.c	2009-10-13 13:17:38.435159176 +0200
+@@ -130,6 +130,9 @@
+ #include "s_apps.h"
+ #include <openssl/err.h>
+ 
++/* Solaris OpenSSL */
++#include <dlfcn.h>
++
+ /* The LHASH callbacks ("hash" & "cmp") have been replaced by functions with the
+  * base prototypes (we cast each variable inside the function to the required
+  * type of "FUNCTION*"). This removes the necessity for macro-generated wrapper
+@@ -151,9 +154,10 @@
+ #endif
+ 
+ 
++static int *modes;
++
+ static void lock_dbg_cb(int mode, int type, const char *file, int line)
+ 	{
+-	static int modes[CRYPTO_NUM_LOCKS]; /* = {0, 0, ... } */
+ 	const char *errstr = NULL;
+ 	int rw;
+ 	
+@@ -164,7 +168,7 @@
+ 		goto err;
+ 		}
+ 
+-	if (type < 0 || type >= CRYPTO_NUM_LOCKS)
++	if (type < 0 || type >= CRYPTO_num_locks())
+ 		{
+ 		errstr = "type out of bounds";
+ 		goto err;
+@@ -235,16 +239,29 @@
+ 
+ 	in_FIPS_mode = 0;
+ 
+-#ifdef OPENSSL_FIPS
++/*
++ * Solaris OpenSSL
++ * Add a further check for the FIPS_mode_set() symbol before calling to
++ * allow openssl(1openssl) to be run against both fips and non-fips libraries.
++ */
+ 	if(getenv("OPENSSL_FIPS")) {
+-		if (!FIPS_mode_set(1)) {
++
++	int (*FIPS_mode_set)(int);
++	FIPS_mode_set = (int (*)(int)) dlsym(RTLD_NEXT, "FIPS_mode_set");
++
++	if (FIPS_mode_set != NULL) {
++		if (!(*FIPS_mode_set)(1)) {
+ 			ERR_load_crypto_strings();
+ 			ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
+ 			EXIT(1);
+ 		}
+ 		in_FIPS_mode = 1;
++	} else {
++			fprintf(stderr, "Failed to enable FIPS mode. "
++			    "For more information about running in FIPS mode see openssl(5).\n");
++			EXIT(1);
++	}
+ 		}
+-#endif
+ 
+ 	if (bio_err == NULL)
+ 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+@@ -269,6 +286,14 @@
+ 	if (getenv("OPENSSL_DEBUG_LOCKING") != NULL)
+ #endif
+ 		{
++		modes = OPENSSL_malloc(CRYPTO_num_locks() * sizeof (int));
++		if (modes == NULL) {
++			ERR_load_crypto_strings();
++			BIO_printf(bio_err,"Memory allocation failure\n");
++			ERR_print_errors(bio_err);
++			EXIT(1);
++		}
++		memset(modes, 0, CRYPTO_num_locks() * sizeof (int));
+ 		CRYPTO_set_locking_callback(lock_dbg_cb);
+ 		}
+ 
+@@ -375,6 +400,8 @@
+ 		BIO_free(bio_err);
+ 		bio_err=NULL;
+ 		}
++
++	if (modes != NULL) OPENSSL_free(modes);
+ 	OPENSSL_EXIT(ret);
+ 	}
+ 
+diff -ruN ../a/openssl-0.9.8k/apps/pkcs12.c openssl-0.9.8k/apps/pkcs12.c
+--- ../a/openssl-0.9.8k/apps/pkcs12.c	2008-11-05 19:36:35.000000000 +0100
++++ openssl-0.9.8k/apps/pkcs12.c	2009-10-13 13:16:47.400594836 +0200
+@@ -68,6 +68,9 @@
+ #include <openssl/pem.h>
+ #include <openssl/pkcs12.h>
+ 
++/* Solaris OpenSSL */
++#include <dlfcn.h>
++
+ #define PROG pkcs12_main
+ 
+ const EVP_CIPHER *enc;
+@@ -125,14 +128,15 @@
+ #ifndef OPENSSL_NO_ENGINE
+     char *engine=NULL;
+ #endif
++    int (*FIPS_mode)();
+ 
+     apps_startup();
+ 
+-#ifdef OPENSSL_FIPS
+-    if (FIPS_mode())
++/* Solaris OpenSSL */
++    FIPS_mode = (int (*)()) dlsym(RTLD_NEXT, "FIPS_mode");
++    if (FIPS_mode != NULL && (*FIPS_mode)())
+ 	cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
+     else
+-#endif
+     cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
+ 
+     enc = EVP_des_ede3_cbc();
--- a/usr/src/lib/openssl/Patches/i386_01-mapfile.patch	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-diff -ruN openssl-0.9.8k/Makefile.shared openssl-0.9.8k/Makefile.shared
---- openssl-0.9.8k/Makefile.shared	2009-06-25 17:32:17.710483444 +0200
-+++ openssl-0.9.8k/Makefile.shared	2009-06-25 17:31:31.350683471 +0200
-@@ -331,6 +331,9 @@
- 		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
- 		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
- 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
-+		if [ $(LIBNAME) = "crypto" ]; then \
-+			SHAREDFLAGS="$${SHAREDFLAGS} -M ../crypto.mapfile"; \
-+		fi; \
- 	fi; \
- 	$(LINK_SO_O)
- link_a.solaris:
-@@ -345,6 +348,9 @@
- 		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
- 		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
- 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
-+		if [ $(LIBNAME) = "crypto" ]; then \
-+			SHAREDFLAGS="$${SHAREDFLAGS} -M ../crypto.mapfile"; \
-+		fi; \
- 	fi; \
- 	$(LINK_SO_A)
- link_app.solaris:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/Patches/x86_32-01-mapfile.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,23 @@
+diff -ruN openssl-0.9.8k/Makefile.shared openssl-0.9.8k/Makefile.shared
+--- openssl-0.9.8k/Makefile.shared	2009-06-25 17:32:17.710483444 +0200
++++ openssl-0.9.8k/Makefile.shared	2009-06-25 17:31:31.350683471 +0200
+@@ -331,6 +331,9 @@
+ 		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
+ 		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+ 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
++		if [ $(LIBNAME) = "crypto" ]; then \
++			SHAREDFLAGS="$${SHAREDFLAGS} -M ../crypto.mapfile"; \
++		fi; \
+ 	fi; \
+ 	$(LINK_SO_O)
+ link_a.solaris:
+@@ -345,6 +348,9 @@
+ 		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
+ 		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+ 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
++		if [ $(LIBNAME) = "crypto" ]; then \
++			SHAREDFLAGS="$${SHAREDFLAGS} -M ../crypto.mapfile"; \
++		fi; \
+ 	fi; \
+ 	$(LINK_SO_A)
+ link_app.solaris:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/README	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,170 @@
+
+Build Layout
+---
+
+OpenSSL is built twice. Once for "fips" and once for "non-fips". Both
+the fips and non-fips builds share Patches and Configure-time options
+where possible. It is very important that they are ABI compatible. All
+the common patches are contained in the Patches sub-directory and common
+configuration is taken from Makefile.com in the top-level openssl
+directory. If a particular build requires a modification which is not
+common to both builds then the patch is kept in the build specific
+sub-directory.
+
+In addition to the regular Makefile targets both the fips and non-fips
+builds have the following targets:
+
+all32
+all64
+install32
+install64
+
+This makes building any subset easy.
+i.e. to build and install the 64bit non-fips OpenSSL the following
+command is used:
+
+$ cd openssl/non-fips
+$ make install64
+
+
+The fips Build
+---
+
+The "fips" build has the following deliverables (symbolic links and
+architecture specific binaries are excluded):
+
+/lib/openssl/fips-140/libcrypto.so.0.9.8
+/usr/include/openssl/fips-140/openssl/fips.h
+/usr/include/openssl/fips-140/openssl/fips_rand.h
+/usr/include/openssl/fips-140/openssl/opensslconf.h
+
+A build-time requirement for the fips build is the FIPS Object Module.
+The FIPS Object Module has very stringent build requirements as
+specified in its Security Policy:
+http://www.openssl.org/docs/fips/SecurityPolicy-1.2.pdf
+
+In essence the FIPS Object Module may not be patched or modified in any
+way, the build must be performed with "./config [no-asm], make, 
+make install". The only way to influence the build is by modifying the
+environment it is run in. isalist is "faked" so that the 32bit build can
+be built even when running with a 64bit kernel (see isalist.sh). make is
+run by a wrapper script so that "make install" can be run even as a
+non-root user (see make.sh).  If modifications are to be make to how the
+FIPS Object Module is built the security policy must be consulted to
+ensure that the build is still compliant.
+
+The non-fips Build.
+---
+
+The "non-fips" build is the main build of OpenSSL and includes the
+regular binaries, libraries and header files. The openssl binary from
+this build is patched to work with both the fips build of libcrypto and
+the non-fips build of libcrypto.
+
+
+Patches
+---
+
+08-6193522.patch
+Give CA.pl better defaults. See 6193522 for more information.
+
+09-6346809.patch
+Fix for buggy use of S_IFxxx. See 6346809 for more information.
+
+11-6546806.patch
+Make sure the HMAC_CTX_init(3) man page gets delivered. See 6546806 for
+more information.
+
+12-6607590.patch
+Missing functions in pem(3). See 6607590 for more information.
+
+14-manpage_openssl.patch
+Force openssl to install man pages into man[1357]openssl instead of
+man[1357].
+
+15-pkcs11_engine-0.9.8a.patch
+Patch which adds the pkcs11 engine. See also the pkcs11-engine/
+sub-directory. 
+
+16-pkgconfig.patch
+Make sure that openssl.pc contains the correct location for the OpenSSL
+libs (/lib) and doesn't include '-R' for a standard library location.
+
+18-compiler_opts.patch
+Adds four Solaris specific configurations (both 32bit and 64bit for both
+sparc and x86) to Configure which are then explicitly used by the
+Makefiles.
+Care should be taken if modifying this patch as changes to compile-time
+options can change the ABI. One example of this is the use of RC4_INT vs
+RC4_CHAR.
+
+19-disable_Bsymbolic.patch
+The "-B symbolic" option for ld will bind references to global symbols
+to their definitions. This will ensure that internal symbol references
+will always be correctly satisfied from within the library however it
+also prevents interposition and according to the man page is "not
+recommended for general use". Direct bindings are preferred (see 
+18-compiler_opts.patch).
+
+20-remove_rpath.patch
+Prevent build binaries having an unnecessary runpath (/lib).
+
+22-pic_asm.patch
+This patch is a direct consequence of wanting to use direct bindings
+instead of -B symbolic. Direct bindings can only be used when the code
+is PIC. Unfortunately some of the hand-coded asm is not PIC - this
+patch rectifies that for amd64.
+
+23-noexstack.patch
+Build with non-executable stacks and non-executable data (x86).
+
+24-6850304.patch
+Fix for CVE-2009-1377, CVE-2009-1378, CVE-2009-1379. See 6850304 for
+more information.
+
+25-fips_rand.patch
+fips_rand.h assumes that des.h will be found in the same directory. This
+is probably normally true however we deliver the FIPS specific header
+files into a non-standard location (see above) and so is not true for
+Solaris. This patch makes sure that des.h is found by changing
+fips_rand.h to look in the system header files for openssl/des.h.
+
+26-openssl_fips.patch
+Modifies openssl so that it will run with the non-fips libcrypto as well
+as the fips libcrypto. If it is run with the fips libcrypto it can be
+run in FIPS mode. Instead of directly using the FIPS specific symbols
+they are looked up at runtime. This is necessary as the non-fips
+libcrypto won't have the those FIPS specific symbols.
+The CRYPTO_NUM_LOCKS pre-processor macro varies between the fips and
+non-fips build of libcrypto. A run-time mechanism is available which
+returns the number of locks - the CRYPTO_num_locks() function. Using
+this function is required if the openssl binary is to be run with both
+the fips and non-fips versions of libcrypto. 
+
+opensslconf.patch
+Modifies opensslconf.h so that it is suitable for both 32bit and 64bit
+installs. OpenSSL either builds for 32bit or 64bit - it doesn't allow
+for combined 32bit and 64bit builds.
+
+x86_32-01-mapfile.patch
+This patch is a direct consequence of wanting to use direct bindings
+instead of -B symbolic. Direct bindings can only be used when the code
+is PIC. Unfortunately some of the hand-coded asm is not PIC - this
+patch allows the x86 build to use a map file to mark the non-PIC symbols
+as "protected". See also "non-fips/crypto.mapfile".
+
+x86_64-01-mapfile.patch
+Same as x86_32-01-mapfile.patch but for the fips amd64 build. See also
+"fips/crypto-amd64.mapfile".
+
+sparc-01-ccwrap.patch
+A sparc only patch which modifies fipsld for the FIPS Capable OpenSSL
+build by replacing calls to CC with CCWRAP. CCRWAP (ccwrap.sh) simply
+runs the original CC command without the "-g" option.
+From the patch:
+# Wrap the calls to cc to remove the "-g" option when compiling
+# (SPARC only). If "-g" is used on SPARC to build libcrypto.so
+# the fingerprint will be incorrectly generated as "-g" promotes
+# static symbols to globals which then interacts with the linker to
+# produce a changed text section.
+
--- a/usr/src/lib/openssl/crypto.mapfile	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)crypto.mapfile	1.1	09/08/04 SMI"
-#
-
-{
-	protected:
-		AES_set_encrypt_key;
-		BF_decrypt;
-		BF_encrypt;
-		DES_decrypt3;
-		DES_encrypt1;
-		DES_encrypt2;
-		DES_encrypt3;
-		_x86_AES_decrypt;
-		_x86_AES_encrypt;
-};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/fips/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,111 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"@(#)Makefile.sfw	1.1	09/11/05 SMI"
+
+include $(SRC)/lib/Makefile.lib
+include ../Makefile.com
+
+VERSION=$(COMPONENT_VERSION:sh)
+
+OPENSSL_FIPS = openssl-fips
+PROGS = ccwrap
+
+FIPS_VERSION = 1.2
+FIPS_NAME = openssl-fips
+
+FIPS_VER = $(FIPS_NAME)-$(FIPS_VERSION)
+FIPS_VER64 = $(FIPS_VER)-64
+
+SUBDIRS = $(OPENSSL_FIPS)
+
+CONFIGURE_OPTIONS += fips \
+		--with-fipslibdir="$(PWD)/$(OPENSSL_FIPS)/$(FIPS_VER)/fips"
+CONFIGURE_OPTIONS64 += fips \
+		--with-fipslibdir="$(PWD)/$(OPENSSL_FIPS)/$(FIPS_VER64)/fips"
+
+PATCHES:sh = mkdir -p Patches; cp -rpf ../Patches/*.patch Patches/; \
+	cp -fp *.patch Patches/; \
+ 	echo Patches/[0-2][0-9]*.patch
+
+PATCHES_i386:sh  = echo Patches/x86_32-*.patch 
+PATCHES_amd64:sh = echo Patches/x86_64-*.patch
+PATCHES_sparc:sh = echo Patches/sparc-*.patch
+PATCHES_sparcv9:sh = echo Patches/sparc-*.patch
+
+PATCHES_32 = $(PATCHES_$(MACH))
+PATCHES_64 = $(PATCHES_$(MACH64))
+
+CONFIG_STATUS = config.status
+
+all := TARGET = all
+all32 := TARGET = all32
+all64 := TARGET = all64
+clean := TARGET = clean
+
+all:  $(SUBDIRS) all32 all64
+
+$(SUBDIRS): FRC.targ
+	@cd $@; pwd; $(CCSMAKE) $(MAKEFILE) $(TARGET)
+
+all32: $(VER)/$(CONFIG_STATUS) $(VER)/$(PKCS11_STAMP) $(PROGS) $(SUBDIRS)
+	cd $(VER); env - \
+	PATH=$(PWD):$(SFW_PATH) \
+	$(CCSMAKE)
+
+all64: $(VER64)/$(CONFIG_STATUS) $(VER64)/$(PKCS11_STAMP) $(PROGS) $(SUBDIRS)
+	cd $(VER64); env - \
+	PATH=$(PWD):$(SFW_PATH) \
+	$(CCSMAKE)
+
+$(VER)/$(CONFIG_STATUS): $(VER)/$(SFW_STAMP_PATCHED) 
+	cd $(VER); env - \
+	PATH=$(SFW_PATH) \
+	$(SHELL) ./Configure $(CONFIGURE_OPTIONS)
+	$(GPATCH) $(VER)/crypto/opensslconf.h Patches/opensslconf.patch
+	cd $(VER); $(CCSMAKE) depend
+	$(TOUCH) $@
+
+$(VER64)/$(CONFIG_STATUS): $(VER64)/$(SFW_STAMP_PATCHED)
+	cd $(VER64); env - \
+	PATH=$(SFW_PATH) \
+	$(SHELL) ./Configure $(CONFIGURE_OPTIONS64)
+	cd $(VER64); $(CCSMAKE) depend
+	$(TOUCH) $@
+
+install: all install32 install64
+
+install32: all32
+	VERDIR=$(VER) VERSION=$(VERSION) $(SHELL) ./install-sfw
+
+install64: all64
+	MACH64=$(MACH64) VERDIR=$(VER64) \
+	    VERSION=$(VERSION) $(SHELL) ./install-sfw-64
+
+clean: $(SUBDIRS)
+	-rm -rf $(VER) $(VER64) $(PROGS) Patches
+
+include $(SRC)/lib/Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/fips/ccwrap.sh	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"@(#)ccwrap.sh	1.1	09/11/05 SMI"
+
+# Very simple cc wrapper whose only purpose is to remove "-g" from
+# the cc command line.
+
+# This is called from fipsld. See fipsld for more information.
+
+CC_CMD=""
+while [ $# -ne 0 ]; do
+	if [ "$1" != "-g" ]; then
+		CC_CMD="$CC_CMD '$1'"
+	fi
+	shift;
+done
+
+eval $CC_CMD
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/fips/crypto-amd64.mapfile	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)crypto-amd64.mapfile	1.1	09/11/05 SMI"
+#
+
+#
+# Mark the following symbols as protected as they come from non-PIC
+# hand-coded assembly. "protected" is the new name for "symbolic".
+#
+
+{
+	protected:
+		OPENSSL_cpuid_setup;
+		OPENSSL_ia32cap_P;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/fips/crypto.mapfile	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"@(#)crypto.mapfile	1.1	09/11/05 SMI"
+#
+
+#
+# Mark the following symbols as protected as they come from non-PIC
+# hand-coded assembly. "protected" is the new name for "symbolic".
+#
+
+{
+	protected:
+		BF_decrypt;
+		BF_encrypt;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/fips/install-sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,52 @@
+#!/usr/bin/ksh93
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"@(#)install-sfw	1.1	09/11/05 SMI"
+
+set -o errexit
+
+LIBDIR=${ROOT}/lib/openssl/fips-140
+INCDIR=${ROOT}/usr/include/openssl/fips-140
+
+LIBVER=${VERSION%[a-z]}
+
+source ${SRC}/tools/install.subr
+
+cd ${VERDIR}
+
+# Install libraries
+mkdir -p ${LIBDIR}
+_install D libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so.${LIBVER} 0755
+_install L libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so
+
+# Install header files
+mkdir -p ${INCDIR}/openssl
+cd include/openssl
+_install N fips.h ${INCDIR}/openssl/fips.h 0444
+_install N fips_rand.h ${INCDIR}/openssl/fips_rand.h 0444
+_install N opensslconf.h ${INCDIR}/openssl/opensslconf.h 0444
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/fips/install-sfw-64	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,45 @@
+#!/usr/bin/ksh93
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"@(#)install-sfw-64	1.1	09/11/05 SMI"
+
+set -o errexit
+
+LIBDIR=${ROOT}/lib/openssl/fips-140
+
+LIBVER=${VERSION%[a-z]}
+
+source ${SRC}/tools/install.subr
+
+cd ${VERDIR}
+
+# Install libraries
+mkdir -p ${LIBDIR}/${MACH64}
+_install D libcrypto.so.${LIBVER} ${LIBDIR}/${MACH64}/libcrypto.so.${LIBVER} 0755
+_install L libcrypto.so.${LIBVER} ${LIBDIR}/${MACH64}/libcrypto.so
+_install L ${MACH64} ${LIBDIR}/64
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/fips/openssl-fips/32/isalist.sh	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,44 @@
+#!/bin/ksh93
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"@(#)isalist.sh	1.1	09/11/05 SMI"
+#
+
+# A simple isalist replacement which pretends to be 32bit even
+# when running 64bit.
+
+UNAME_M=$(uname -m)
+
+case $UNAME_M in
+	sun4[uv])
+		echo "sparcv8"
+		;;
+	i86pc)
+		echo "i386"
+		;;
+	*)
+		echo "unknown"
+		;;
+esac
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/fips/openssl-fips/METADATA	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,11 @@
+NAME:			openssl-fips
+VERSION:		1.2
+DESCRIPTION:		FIPS 140-2 validated OpenSSL FIPS Object Module
+LICENSE:		BSD-LIKE
+PACKAGE:		SUNWopenssl-fips-140 SUNWopenssl-fips-140-include
+PROJECT_URL:		http://openssl.org
+SOURCE_DOWNLOAD:	http://openssl.org/source/openssl-fips-1.2.tar.gz
+SUPPORT:		Full
+BUGTRAQ:		solaris/solaris-crypto/openssl
+OSR:			11726
+COMMENTS:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/fips/openssl-fips/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,88 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"@(#)Makefile.sfw	1.1	09/11/05 SMI"
+
+VER =$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
+TARBALL =$(VER).tar.gz
+VER64 =$(VER)-64
+
+OPENSSL_FIPS_HMAC_KEY = etaonrishdlcupfm
+OPENSSL_FIPS_HMAC = 79193087e8115df76d3de1f346f7410df79cf6e0
+
+VERIFIED = verified
+
+# In order to build a 32bit version isalist must be substituted for
+# the 32bit build so that amd64|sparcv9 is not part of its output.  In
+# order to allow make install to be run we have to fake "make install".
+# The command sets U1 and U2 are defined in the FIPS 1.2 security policy
+# and must be run as shown there. Nothing from the tarball can be
+# modified.
+
+FAKE_ISALIST = 32/isalist
+FAKE_MAKE = make
+FAKE_APPS = $(FAKE_ISALIST) $(FAKE_MAKE)
+
+FIPS_PATH = $(PWD):$(PWD)/32:$(SFW_PATH)
+FIPS_PATH64 = $(PWD):$(SFW_PATH)
+
+BUILD_STAMP= stamp.built
+
+include ../../../Makefile.lib
+
+all: all32 all64
+
+all32: $(VER)/$(BUILD_STAMP) $(VER)/$(VERIFIED)
+
+all64: $(VER64)/$(BUILD_STAMP) $(VER64)/$(VERIFIED)
+
+# Command set U1
+$(VER)/$(BUILD_STAMP): $(FAKE_APPS) $(VER)/$(SFW_STAMP_UNPACKED)
+	cd $(VER); env - \
+	PATH=$(FIPS_PATH) CCSMAKE=$(CCSMAKE) $(SHELL) -c " \
+	./config fipscanisterbuild no-asm; \
+	make; \
+	make install"
+	$(TOUCH) $@
+
+# Command set U2
+$(VER64)/$(BUILD_STAMP): $(FAKE_APPS) $(VER64)/$(SFW_STAMP_UNPACKED)
+	cd $(VER64); env - \
+	PATH=$(FIPS_PATH64) CCSMAKE=$(CCSMAKE) $(SHELL) -c " \
+	./config fipscanisterbuild; \
+	make; \
+	make install"
+	$(TOUCH) $@
+
+%/$(VERIFIED):
+	env - OPENSSL_FIPS=1 LD_LIBRARY_PATH=$(@D) \
+	$(@D)/apps/openssl sha1 -hmac $(OPENSSL_FIPS_HMAC_KEY) $(TARBALL) | \
+	    /usr/bin/nawk '{ if ($$2 != "$(OPENSSL_FIPS_HMAC)") exit 1 }'
+
+clean:	
+	-rm -rf $(VER) $(VER64) $(FAKE_APPS)
+
+include ../../../Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/fips/openssl-fips/make.sh	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,33 @@
+#!/bin/ksh93
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)make.sh	1.1	09/11/05 SMI"
+#
+
+# Make "make install" a no-op. Everything else gets passed through
+# make(1S).
+
+if [[ $1 != install ]]; then
+	${CCSMAKE} "$@"
+fi
Binary file usr/src/lib/openssl/fips/openssl-fips/openssl-fips-1.2.tar.gz has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/fips/sparc-01-ccwrap.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,54 @@
+diff -ruN ../a/openssl-0.9.8k/fips/fipsld openssl-0.9.8k/fips/fipsld
+--- ../a/openssl-0.9.8k/fips/fipsld	2008-09-16 12:12:10.000000000 +0200
++++ openssl-0.9.8k/fips/fipsld	2009-10-06 16:45:34.379991933 +0200
+@@ -12,6 +12,14 @@
+ 
+ #set -x
+ 
++# Solaris OpenSSL:
++# Wrap the calls to cc to remove the "-g" option when compiling
++# (SPARC only). If "-g" is used on SPARC to build libcrypto.so
++# the fingerprint will be incorrectly generated as "-g" promotes
++# static symbols to globals which then interacts with the linker to
++# produce a changed text section.
++CCWRAP=ccwrap
++
+ CC=${FIPSLD_CC:-${CC}}
+ [ -n "${CC}" ] || { echo '$CC is not defined'; exit 1; }
+ 
+@@ -112,7 +120,7 @@
+ 	fi
+ 
+ 	/bin/rm -f "${TARGET}"
+-	${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \
++	${CCWRAP} ${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \
+ 		"${PREMAIN_C}" \
+ 		${_WL_PREMAIN} "$@"
+ 
+@@ -124,7 +132,7 @@
+ 	fi
+ 
+ 	# recompile with signature...
+-	${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \
++	${CCWRAP} ${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \
+ 		-DHMAC_SHA1_SIG=\"${SIG}\" "${PREMAIN_C}" \
+ 		${_WL_PREMAIN} "$@"
+ 	;;
+@@ -151,7 +159,7 @@
+ 	{ echo "${PREMAIN_C} fingerprint mismatch"; exit 1; }
+ 
+ 	/bin/rm -f "${TARGET}"
+-	${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \
++	${CCWRAP} ${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \
+ 		"${PREMAIN_C}" \
+ 		${_WL_PREMAIN} "$@"
+ 
+@@ -163,7 +171,7 @@
+ 	fi
+ 
+ 	# recompile with signature...
+-	${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \
++	${CCWRAP} ${CC}	${CANISTER_O_CMD:+"${CANISTER_O_CMD}"} \
+ 		-DHMAC_SHA1_SIG=\"${SIG}\" "${PREMAIN_C}" \
+ 		${_WL_PREMAIN} "$@"
+ 	;;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/fips/x86_64-01-mapfile.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,23 @@
+diff -ruN openssl-0.9.8k/Makefile.shared openssl-0.9.8k/Makefile.shared
+--- openssl-0.9.8k/Makefile.shared	2009-06-25 17:32:17.710483444 +0200
++++ openssl-0.9.8k/Makefile.shared	2009-06-25 17:31:31.350683471 +0200
+@@ -331,6 +331,9 @@
+ 		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
+ 		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+ 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
++		if [ $(LIBNAME) = "crypto" ]; then \
++			SHAREDFLAGS="$${SHAREDFLAGS} -M ../crypto-amd64.mapfile"; \
++		fi; \
+ 	fi; \
+ 	$(LINK_SO_O)
+ link_a.solaris:
+@@ -345,6 +348,9 @@
+ 		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
+ 		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+ 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
++		if [ $(LIBNAME) = "crypto" ]; then \
++			SHAREDFLAGS="$${SHAREDFLAGS} -M ../crypto-amd64.mapfile"; \
++		fi; \
+ 	fi; \
+ 	$(LINK_SO_A)
+ link_app.solaris:
--- a/usr/src/lib/openssl/install-sfw	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-#!/usr/bin/ksh93
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-# ident	"@(#)install-sfw	1.1	09/05/28 SMI"
-
-set -o errexit
-
-LIBDIR=${ROOT}/lib
-BINDIR=${ROOT}/usr/bin
-MANDIR=${ROOT}/usr/share/man
-
-source ${SRC}/tools/install.subr
-
-# OpenSSL doesn't like installing to man dirs like "man1openssl".
-# See also manpage_openssl.patch. The following is always run after
-# the "install" target but before the "install_docs" target.
-mkdir -p ${MANDIR}/man1openssl
-mkdir -p ${MANDIR}/man3openssl
-mkdir -p ${MANDIR}/man5openssl
-mkdir -p ${MANDIR}/man7openssl
-
-mv -f ${ROOT}/etc/openssl/misc/CA.pl ${BINDIR}/
-mv -f ${ROOT}/usr/lib/libcrypto.so* ${LIBDIR}/
-mv -f ${ROOT}/usr/lib/libssl.so* ${LIBDIR}/
-
-# Strip binaries - libcrypto, libssl, openssl
-for bin in ${LIBDIR}/libcrypto.so.0.9.8 ${LIBDIR}/libssl.so.0.9.8 \
-    ${BINDIR}/openssl; do
-	chmod 0755 $bin
-	${SRC}/tools/post_process_so $bin
-done
-
-# Install lint libraries
-_install N llib-lcrypto ${LIBDIR}/llib-lcrypto 0644
-_install N ${VERS}/llib-lcrypto.ln ${LIBDIR}/llib-lcrypto.ln 0644
-_install N llib-lssl ${LIBDIR}/llib-lssl 0644
-_install N ${VERS}/llib-lssl.ln ${LIBDIR}/llib-lssl.ln 0644
-
-# Install missing sym links
-(cd ${ROOT}/etc/sfw; _install L ../openssl openssl)
-(cd ${ROOT}/usr/sfw/bin; _install L ../../bin/openssl openssl)
-
-# Clean up proto area
-rm -f ${ROOT}/usr/bin/c_rehash
-rm -f ${ROOT}/usr/lib/libcrypto.a
-rm -f ${ROOT}/usr/lib/libssl.a
-rm -f ${ROOT}/usr/lib/pkgconfig/libcrypto.pc
-rm -f ${ROOT}/usr/lib/pkgconfig/libssl.pc
-rm -rf ${ROOT}/etc/openssl/misc
-rm -rf ${ROOT}/usr/lib/engines
-
-exit 0
--- a/usr/src/lib/openssl/install-sfw-64	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-#!/usr/bin/ksh93
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-# ident	"@(#)install-sfw-64	1.2	09/06/04 SMI"
-
-set -o errexit
-
-LIBDIR=${ROOT}/lib/${MACH64}	# MACH64 passed in by makefile
-BINDIR=${ROOT}/usr/bin/${MACH64}
-USRLIBDIR=${ROOT}/usr/lib/${MACH64}
-SFWBINDIR=${ROOT}/usr/sfw/bin/${MACH64}
-
-source ${SRC}/tools/install.subr
-
-mv -f ${ROOT}/usr/bin/openssl ${BINDIR}/openssl
-mv -f ${ROOT}/usr/lib/libcrypto.so* ${LIBDIR}/
-mv -f ${ROOT}/usr/lib/libssl.so* ${LIBDIR}/
-mv -f ${ROOT}/usr/lib/pkgconfig/openssl.pc ${USRLIBDIR}/pkgconfig
-
-# Install missing sym links
-(cd ${ROOT}/usr/sfw/lib; _install L ${MACH64} 64)
-(cd ${ROOT}/lib; _install L ${MACH64} 64)
-(cd ${SFWBINDIR}; _install L ../../../bin/${MACH64}/openssl openssl)
-
-# Strip binaries - libcrypto, libssl, openssl
-for bin in ${LIBDIR}/libcrypto.so.0.9.8 ${LIBDIR}/libssl.so.0.9.8 \
-    ${BINDIR}/openssl; do
-	chmod 0755 $bin
-	${SRC}/tools/post_process_so $bin
-done
-
-# Install lint libraries
-_install N ${VERS}/llib-lcrypto.ln ${LIBDIR}/llib-lcrypto.ln 0644
-_install N ${VERS}/llib-lssl.ln ${LIBDIR}/llib-lssl.ln 0644
-
-exit 0
--- a/usr/src/lib/openssl/llib-lcrypto	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"@(#)llib-lcrypto	1.1	09/05/28 SMI"
-
-#include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/bio.h>
-#include <openssl/blowfish.h>
-#include <openssl/bn.h>
-#include <openssl/buffer.h>
-#include <openssl/comp.h>
-#include <openssl/conf.h>
-#include <openssl/conf_api.h>
-#include <openssl/crypto.h>
-#include <openssl/des.h>
-#include <openssl/dh.h>
-#include <openssl/dsa.h>
-#include <openssl/dso.h>
-#include <openssl/e_os2.h>
-#include <openssl/ebcdic.h>
-#include <openssl/engine.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/lhash.h>
-#include <openssl/obj_mac.h>
-#include <openssl/objects.h>
-#include <openssl/opensslconf.h>
-#include <openssl/opensslv.h>
-#include <openssl/pem.h>
-#include <openssl/pem2.h>
-#include <openssl/pkcs12.h>
-#include <openssl/pkcs7.h>
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
-#include <openssl/safestack.h>
-#include <openssl/sha.h>
-#include <openssl/stack.h>
-#include <openssl/symhacks.h>
-#include <openssl/tmdiff.h>
-#include <openssl/txt_db.h>
-#include <openssl/x509.h>
-#include <openssl/x509_vfy.h>
-#include <openssl/x509v3.h>
--- a/usr/src/lib/openssl/llib-lssl	Sun Dec 20 07:09:18 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-#pragma ident	"@(#)llib-lssl	1.1	09/05/28 SMI"
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-#include <openssl/ssl.h>
-#include <openssl/ssl2.h>
-#include <openssl/ssl23.h>
-#include <openssl/ssl3.h>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/non-fips/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,106 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"@(#)Makefile.sfw	1.1	09/11/05 SMI"
+
+include $(SRC)/lib/Makefile.lib
+include ../Makefile.com
+
+VERSION=$(COMPONENT_VERSION:sh)
+
+MANDIR = $(ROOT)/usr/share/man
+
+LINTFLAGS += -I./include
+LINTFLAGS64 += -I./include -m64
+
+PATCHES:sh = ln -sf ../Patches Patches; echo Patches/[0-2][0-9]*.patch
+
+# The following patch only applies to the x86 build target
+PATCHES_i386:sh  = echo Patches/x86_32-*.patch
+PATCHES_32 = $(PATCHES_$(MACH))
+
+CONFIG_STATUS = config.status
+
+all: all32 all64 lint
+ 
+all32: $(VER)/$(CONFIG_STATUS) $(VER)/$(PKCS11_STAMP) lint32
+	cd $(VER); env - \
+	PATH=$(SFW_PATH) \
+	$(CCSMAKE)
+
+all64: $(VER64)/$(CONFIG_STATUS) $(VER64)/$(PKCS11_STAMP) lint64
+	cd $(VER64); env - \
+	PATH=$(SFW_PATH) \
+	$(CCSMAKE)
+
+lint: lint32 lint64
+
+# opensslconf.h is patched to ensure suitability for both 64bit and 32bit
+$(VER)/$(CONFIG_STATUS): $(VER)/$(SFW_STAMP_PATCHED)
+	cd $(VER); env - \
+	PATH=$(SFW_PATH) \
+	$(SHELL) ./Configure $(CONFIGURE_OPTIONS) 
+	$(GPATCH) $(VER)/crypto/opensslconf.h Patches/opensslconf.patch
+	cd $(VER); $(CCSMAKE) depend
+	$(TOUCH) $@
+
+$(VER64)/$(CONFIG_STATUS): $(VER64)/$(SFW_STAMP_PATCHED)
+	cd $(VER64); env - \
+	PATH=$(SFW_PATH) \
+	$(SHELL) ./Configure $(CONFIGURE_OPTIONS64)
+	cd $(VER64); $(CCSMAKE) depend
+	$(TOUCH) $@
+
+lint32: $(VER)/$(CONFIG_STATUS)
+	cd $(VER); \
+		$(LINT.c) -o crypto ../llib-lcrypto > /dev/null 2>&1; \
+		$(LINT.c) -o ssl ../llib-lssl > /dev/null 2>&1
+
+lint64: $(VER64)/$(CONFIG_STATUS)
+	cd $(VER64); \
+		$(LINT64.c) -o crypto ../llib-lcrypto > /dev/null 2>&1; \
+		$(LINT64.c) -o ssl ../llib-lssl > /dev/null 2>&1
+
+install: all lint install32 install64 install_docs
+
+install32: all32
+	VERDIR=$(VER) VERSION=$(VERSION) $(SHELL) ./install-sfw
+
+install64: all64
+	MACH64=$(MACH64) VERDIR=$(VER64) \
+	    VERSION=$(VERSION) $(SHELL) ./install-sfw-64
+
+install_docs:
+	rm -rf $(MANDIR)/man*openssl/*;
+	cd $(VER); \
+	umask 0222; env - \
+	PATH=$(SFW_PATH) \
+	$(CCSMAKE) MANDIR=/usr/share/man install_docs
+
+clean:
+	-rm -rf $(VER) $(VER64) Patches
+
+include $(SRC)/lib/Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/non-fips/crypto.mapfile	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"@(#)crypto.mapfile	1.2	09/11/05 SMI"
+#
+
+#
+# Mark the following symbols as protected as they come from non-PIC
+# hand-coded assembly. "protected" is the new name for "symbolic".
+#
+
+{
+	protected:
+		AES_set_encrypt_key;
+		BF_decrypt;
+		BF_encrypt;
+		DES_decrypt3;
+		DES_encrypt1;
+		DES_encrypt2;
+		DES_encrypt3;
+		_x86_AES_decrypt;
+		_x86_AES_encrypt;
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/non-fips/install-sfw	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,79 @@
+#!/usr/bin/ksh93
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"@(#)install-sfw	1.2	09/11/05 SMI"
+
+set -o errexit
+
+LIBDIR=${ROOT}/lib
+BINDIR=${ROOT}/usr/bin
+USRLIBDIR=${ROOT}/usr/lib
+INCDIR=${ROOT}/usr/include
+
+LIBVER=${VERSION%[a-z]}
+
+source ${SRC}/tools/install.subr
+
+# Install lint libraries
+_install N llib-lcrypto ${LIBDIR}/llib-lcrypto 0644
+_install N ${VERDIR}/llib-lcrypto.ln ${LIBDIR}/llib-lcrypto.ln 0644
+_install N llib-lssl ${LIBDIR}/llib-lssl 0644
+_install N ${VERDIR}/llib-lssl.ln ${LIBDIR}/llib-lssl.ln 0644
+
+cd $VERDIR
+
+# Install libraries
+_install D libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so.${LIBVER} 0755
+_install L libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so
+_install D libssl.so.${LIBVER} ${LIBDIR}/libssl.so.${LIBVER} 0755
+_install L libssl.so.${LIBVER} ${LIBDIR}/libssl.so
+
+# Install commands
+_install P apps/CA.pl ${BINDIR}/CA.pl 0555
+_install E apps/openssl ${BINDIR}/openssl 0555
+_install L ../../bin/openssl ${ROOT}/usr/sfw/bin/openssl
+
+# Install etc
+mkdir -p ${ROOT}/etc/openssl
+mkdir -p ${ROOT}/etc/openssl/certs
+mkdir -p ${ROOT}/etc/openssl/private
+chmod 0700 ${ROOT}/etc/openssl/private
+_install N apps/openssl.cnf ${ROOT}/etc/openssl/openssl.cnf 0644
+_install L ../openssl ${ROOT}/etc/sfw/openssl
+
+
+# Install package config file
+_install N openssl.pc ${USRLIBDIR}/pkgconfig/openssl.pc 0444
+
+# Install header files
+mkdir -p ${INCDIR}/openssl
+cd include/openssl
+for header in !(ec*|fips*|idea*); do
+	_install N ${header} ${INCDIR}/openssl/${header} 0444
+done
+
+exit 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/non-fips/install-sfw-64	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,63 @@
+#!/usr/bin/ksh93
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"@(#)install-sfw-64	1.3	09/11/05 SMI"
+
+set -o errexit
+
+LIBDIR=${ROOT}/lib/${MACH64}	# MACH64 passed in by makefile
+BINDIR=${ROOT}/usr/bin/${MACH64}
+USRLIBDIR=${ROOT}/usr/lib/${MACH64}
+SFWLIBDIR=${ROOT}/usr/sfw/lib/${MACH64}
+SFWBINDIR=${ROOT}/usr/sfw/bin/${MACH64}
+
+LIBVER=${VERSION%[a-z]}
+
+source ${SRC}/tools/install.subr
+
+# Install lint libraries
+_install N ${VERDIR}/llib-lcrypto.ln ${LIBDIR}/llib-lcrypto.ln 0644
+_install N ${VERDIR}/llib-lssl.ln ${LIBDIR}/llib-lssl.ln 0644
+
+cd ${VERDIR}
+
+# Install commands
+_install E apps/openssl ${BINDIR}/openssl 0555
+_install L ../../../bin/${MACH64}/openssl ${SFWBINDIR}/openssl
+
+# Install libraries
+_install D libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so.${LIBVER} 0755
+_install L libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so
+_install D libssl.so.${LIBVER} ${LIBDIR}/libssl.so.${LIBVER} 0755
+_install L libssl.so.${LIBVER} ${LIBDIR}/libssl.so
+_install L ${MACH64} ${ROOT}/usr/sfw/lib/64
+_install L ${MACH64} ${ROOT}/lib/64
+
+# Install package config file
+_install N openssl.pc ${USRLIBDIR}/pkgconfig/openssl.pc 0444
+
+exit 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/non-fips/llib-lcrypto	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,50 @@
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"@(#)llib-lcrypto	1.1	09/05/28 SMI"
+
+#include <openssl/asn1.h>
+#include <openssl/asn1_mac.h>
+#include <openssl/bio.h>
+#include <openssl/blowfish.h>
+#include <openssl/bn.h>
+#include <openssl/buffer.h>
+#include <openssl/comp.h>
+#include <openssl/conf.h>
+#include <openssl/conf_api.h>
+#include <openssl/crypto.h>
+#include <openssl/des.h>
+#include <openssl/dh.h>
+#include <openssl/dsa.h>
+#include <openssl/dso.h>
+#include <openssl/e_os2.h>
+#include <openssl/ebcdic.h>
+#include <openssl/engine.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#include <openssl/lhash.h>
+#include <openssl/obj_mac.h>
+#include <openssl/objects.h>
+#include <openssl/opensslconf.h>
+#include <openssl/opensslv.h>
+#include <openssl/pem.h>
+#include <openssl/pem2.h>
+#include <openssl/pkcs12.h>
+#include <openssl/pkcs7.h>
+#include <openssl/rand.h>
+#include <openssl/rsa.h>
+#include <openssl/safestack.h>
+#include <openssl/sha.h>
+#include <openssl/stack.h>
+#include <openssl/symhacks.h>
+#include <openssl/tmdiff.h>
+#include <openssl/txt_db.h>
+#include <openssl/x509.h>
+#include <openssl/x509_vfy.h>
+#include <openssl/x509v3.h>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/openssl/non-fips/llib-lssl	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+#pragma ident	"@(#)llib-lssl	1.1	09/05/28 SMI"
+
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+#include <openssl/ssl.h>
+#include <openssl/ssl2.h>
+#include <openssl/ssl23.h>
+#include <openssl/ssl3.h>
--- a/usr/src/lib/pam_pkcs11/pam_pkcs11.patch	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/lib/pam_pkcs11/pam_pkcs11.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -1,5 +1,5 @@
 *** pam_pkcs11-0.6.0-ORIG/configure.in	Mon Jun 11 05:17:38 2007
---- pam_pkcs11-WS/configure.in	Wed Sep 17 15:09:49 2008
+--- pam_pkcs11-WS/configure.in	Mon Sep 28 16:06:48 2009
 ***************
 *** 237,243 ****
   AC_FUNC_REALLOC
@@ -18,7 +18,7 @@
   
   AC_CONFIG_FILES([ 
 *** pam_pkcs11-0.6.0-ORIG/po/Makefile.in.in	Tue May 22 00:54:56 2007
---- pam_pkcs11-WS/po/Makefile.in.in	Mon Sep 15 16:25:33 2008
+--- pam_pkcs11-WS/po/Makefile.in.in	Mon Sep 28 16:06:48 2009
 ***************
 *** 46,61 ****
   GMSGFMT_ = @GMSGFMT@
@@ -96,7 +96,7 @@
   	  if test -f $(srcdir)/$(DOMAIN).pot; then \
   	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
 *** pam_pkcs11-0.6.0-ORIG/src/common/pkcs11_lib.h	Mon May 21 02:46:19 2007
---- pam_pkcs11-WS/src/common/pkcs11_lib.h	Mon Sep 15 18:30:37 2008
+--- pam_pkcs11-WS/src/common/pkcs11_lib.h	Mon Sep 28 16:06:48 2009
 ***************
 *** 36,46 ****
   PKCS11_EXTERN int find_slot_by_number_and_label(pkcs11_handle_t *h,
@@ -134,7 +134,7 @@
   PKCS11_EXTERN void release_pkcs11_module(pkcs11_handle_t *h);
   PKCS11_EXTERN int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot);
 *** pam_pkcs11-0.6.0-ORIG/src/common/pkcs11_lib.c	Wed Jun  6 02:33:10 2007
---- pam_pkcs11-WS/src/common/pkcs11_lib.c	Wed Sep 17 16:13:47 2008
+--- pam_pkcs11-WS/src/common/pkcs11_lib.c	Mon Sep 28 16:06:48 2009
 ***************
 *** 67,77 ****
 --- 67,138 ----
@@ -807,7 +807,7 @@
     return h->slots[h->current_slot].label;
   }
 *** pam_pkcs11-0.6.0-ORIG/src/pam_pkcs11/Makefile.in	Wed Jun  6 02:23:27 2007
---- pam_pkcs11-WS/src/pam_pkcs11/Makefile.in	Mon Sep 15 16:25:30 2008
+--- pam_pkcs11-WS/src/pam_pkcs11/Makefile.in	Mon Sep 28 16:06:48 2009
 ***************
 *** 234,241 ****
   top_builddir = @top_builddir@
@@ -828,7 +828,7 @@
   pam_pkcs11_la_SOURCES = pam_pkcs11.c  \
   			mapper_mgr.c mapper_mgr.h \
 *** pam_pkcs11-0.6.0-ORIG/src/pam_pkcs11/pam_config.h	Wed Jun  6 02:55:02 2007
---- pam_pkcs11-WS/src/pam_pkcs11/pam_config.h	Thu Oct 16 14:18:16 2008
+--- pam_pkcs11-WS/src/pam_pkcs11/pam_config.h	Mon Sep 28 16:06:48 2009
 ***************
 *** 13,19 ****
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -861,7 +861,7 @@
   };
   
 *** pam_pkcs11-0.6.0-ORIG/src/pam_pkcs11/pam_pkcs11.c	Tue May 22 01:28:33 2007
---- pam_pkcs11-WS/src/pam_pkcs11/pam_pkcs11.c	Thu Oct 16 14:18:27 2008
+--- pam_pkcs11-WS/src/pam_pkcs11/pam_pkcs11.c	Mon Nov  2 15:39:57 2009
 ***************
 *** 12,18 ****
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -897,8 +897,40 @@
   	if(!str) return 1;
   	if (!strcmp(str,"")) return 1;
 ***************
+*** 91,103 ****
+    rv = conv->conv(1, (const struct pam_message **)msgp, &resp, conv->appdata_ptr);
+    if (rv != PAM_SUCCESS)
+      return rv;
+!   if ((resp == NULL) || (resp[0].resp == NULL))
+      return !response ? PAM_SUCCESS : PAM_CRED_INSUFFICIENT;
+    if (response) {
+       *response = strdup(resp[0].resp);
+    }
+    /* overwrite memory and release it */
+    memset(resp[0].resp, 0, strlen(resp[0].resp));
+    free(&resp[0]);
+    return PAM_SUCCESS;
+  }
+--- 91,106 ----
+    rv = conv->conv(1, (const struct pam_message **)msgp, &resp, conv->appdata_ptr);
+    if (rv != PAM_SUCCESS)
+      return rv;
+!   if ((resp == NULL) || (resp[0].resp == NULL)) {
+!     free(&resp[0]);
+      return !response ? PAM_SUCCESS : PAM_CRED_INSUFFICIENT;
++   }
+    if (response) {
+       *response = strdup(resp[0].resp);
+    }
+    /* overwrite memory and release it */
+    memset(resp[0].resp, 0, strlen(resp[0].resp));
++   free(resp[0].resp);
+    free(&resp[0]);
+    return PAM_SUCCESS;
+  }
+***************
 *** 206,211 ****
---- 206,217 ----
+--- 209,220 ----
   	return PAM_AUTHINFO_UNAVAIL;
     }
   
@@ -921,7 +953,7 @@
   	/* get user name */
   	rv = pam_get_user(pamh, &user, NULL);
   
---- 280,289 ----
+--- 283,292 ----
   	    DBG1("explicit username = [%s]", user);
   	} 
     } else {
@@ -942,7 +974,7 @@
     if (rv != 0) {
       ERR("no suitable token available");
       pam_syslog(pamh, LOG_ERR, "no suitable token available");
---- 322,335 ----
+--- 325,338 ----
     }
   
     /* open pkcs #11 session */
@@ -967,7 +999,7 @@
         if (rv != 0) {
           release_pkcs11_module(ph);
           return pkcs11_pam_fail;
---- 351,365 ----
+--- 354,368 ----
           pam_prompt(pamh, PAM_TEXT_INFO, NULL,
                    _("Please insert your smart card."));
         }
@@ -998,7 +1030,7 @@
         if (rv != 0) {
           /* user gave us a user id and no smart card go to next module */
           release_pkcs11_module(ph);
---- 371,391 ----
+--- 374,394 ----
       } else {
         /* we haven't prompted for the user yet, get the user and see if
          * the smart card has been inserted in the mean time */
@@ -1029,7 +1061,7 @@
     }
     rv = open_pkcs11_session(ph, slot_num);
     if (rv != 0) {
---- 393,401 ----
+--- 396,404 ----
         }
       }
     } else {
@@ -1057,7 +1089,7 @@
     }
     if (rv != PAM_SUCCESS) {
       release_pkcs11_module(ph);
---- 406,421 ----
+--- 409,424 ----
     }
   
     /* get password */
@@ -1083,7 +1115,7 @@
     rv = pam_putenv(pamh, env_temp);
   
     if (rv != PAM_SUCCESS) {
---- 589,595 ----
+--- 592,598 ----
     snprintf(env_temp, sizeof(env_temp) - 1,
   	   "PKCS11_LOGIN_TOKEN_NAME=%.*s", 
   	   (sizeof(env_temp) - 1) - strlen("PKCS11_LOGIN_TOKEN_NAME="),
@@ -1092,7 +1124,7 @@
   
     if (rv != PAM_SUCCESS) {
 *** pam_pkcs11-0.6.0-ORIG/src/pam_pkcs11/pam_config.c	Mon May 21 02:46:19 2007
---- pam_pkcs11-WS/src/pam_pkcs11/pam_config.c	Thu Oct 16 14:18:13 2008
+--- pam_pkcs11-WS/src/pam_pkcs11/pam_config.c	Mon Sep 28 16:06:48 2009
 ***************
 *** 20,25 ****
 --- 20,26 ----
@@ -1289,7 +1321,7 @@
 - 
 --- 335,337 ----
 *** pam_pkcs11-0.6.0-ORIG/src/mappers/ldap_mapper.c	Wed Jun  6 02:48:24 2007
---- pam_pkcs11-WS/src/mappers/ldap_mapper.c	Wed Sep 17 15:28:33 2008
+--- pam_pkcs11-WS/src/mappers/ldap_mapper.c	Mon Sep 28 16:06:48 2009
 ***************
 *** 184,192 ****
   	}
@@ -1312,7 +1344,7 @@
   	rc = (*ld == NULL) ? LDAP_SERVER_DOWN : LDAP_SUCCESS;
   
 *** pam_pkcs11-0.6.0-ORIG/src/tools/pkcs11_inspect.c	Mon May 21 02:46:19 2007
---- pam_pkcs11-WS/src/tools/pkcs11_inspect.c	Mon Sep 15 18:43:39 2008
+--- pam_pkcs11-WS/src/tools/pkcs11_inspect.c	Mon Sep 28 16:06:48 2009
 ***************
 *** 53,58 ****
 --- 53,63 ----
@@ -1350,7 +1382,7 @@
       release_pkcs11_module(ph);
       DBG("no token available");
 *** pam_pkcs11-0.6.0-ORIG/src/tools/pklogin_finder.c	Wed Jun  6 03:00:36 2007
---- pam_pkcs11-WS/src/tools/pklogin_finder.c	Mon Sep 15 18:50:19 2008
+--- pam_pkcs11-WS/src/tools/pklogin_finder.c	Mon Sep 28 16:06:48 2009
 ***************
 *** 55,60 ****
 --- 55,65 ----
@@ -1387,7 +1419,7 @@
       release_pkcs11_module(ph);
       DBG("no token available");
 *** pam_pkcs11-0.6.0-ORIG/src/tools/pkcs11_eventmgr.c	Wed Jun  6 04:14:27 2007
---- pam_pkcs11-WS/src/tools/pkcs11_eventmgr.c	Wed Sep 17 14:38:00 2008
+--- pam_pkcs11-WS/src/tools/pkcs11_eventmgr.c	Mon Sep 28 16:06:48 2009
 ***************
 *** 430,435 ****
 --- 430,436 ----
@@ -1429,7 +1461,7 @@
       /* open pkcs11 sesion */
       DBG("initialising pkcs #11 module...");
 *** pam_pkcs11-0.6.0-ORIG/src/tools/pkcs11_listcerts.c	Mon May 21 02:46:19 2007
---- pam_pkcs11-WS/src/tools/pkcs11_listcerts.c	Mon Sep 15 18:47:34 2008
+--- pam_pkcs11-WS/src/tools/pkcs11_listcerts.c	Mon Sep 28 16:06:48 2009
 ***************
 *** 53,58 ****
 --- 53,63 ----
@@ -1467,7 +1499,7 @@
       release_pkcs11_module(ph);
       DBG("no token available");
 *** pam_pkcs11-0.6.0-ORIG/src/tools/pkcs11_setup.c	Wed Jun  6 04:20:09 2007
---- pam_pkcs11-WS/src/tools/pkcs11_setup.c	Mon Sep 15 16:25:27 2008
+--- pam_pkcs11-WS/src/tools/pkcs11_setup.c	Mon Sep 28 16:06:48 2009
 ***************
 *** 60,65 ****
 --- 60,92 ----
@@ -1505,7 +1537,7 @@
   {
       scconf_list *list = NULL;
 *** pam_pkcs11-0.6.0-ORIG/tools/make_hash_link.sh	Mon May 21 02:46:19 2007
---- pam_pkcs11-WS/tools/make_hash_link.sh	Mon Sep 15 16:25:14 2008
+--- pam_pkcs11-WS/tools/make_hash_link.sh	Mon Sep 28 16:06:48 2009
 ***************
 *** 54,60 ****
     hash=`$OPENSSL x509 -inform pem -in $file -noout -hash 2> /dev/null`
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/trousers/Patches/tsp_changeauth.c.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,28 @@
+--- src/tspi/tsp_changeauth.c.orig	Wed Feb 11 09:35:43 2009
++++ src/tspi/tsp_changeauth.c	Tue Oct 27 12:21:03 2009
+@@ -80,9 +80,25 @@
+ {
+ 	TPM_DIGEST digest;
+ 	TSS_RESULT result;
++	TCPA_SECRET secret;
++	TSS_HOBJECT hPolicy;
+ 	Trspi_HashCtx hashCtx;
+ 	struct authsess *xsap = NULL;
+ 
++	if ((result = obj_tpm_get_policy(hObjectToChange, TSS_POLICY_USAGE, &hPolicy)))
++		return result;
++
++	/*
++	 * We don't care about the actual secret object, these
++	 * calls are just used to make sure the secret data
++	 * is properly encoded in the policy object.
++	 */
++	if ((result = obj_policy_get_secret(hPolicy,  TR_SECRET_CTX_NEW, &secret)))
++		return result;
++
++	if ((result = obj_policy_get_secret(hNewPolicy, TR_SECRET_CTX_NEW, &secret)))
++		return result;
++
+ 	if ((result = authsess_xsap_init(tspContext, hObjectToChange, hNewPolicy,
+ 					TSS_AUTH_POLICY_REQUIRED, TPM_ORD_ChangeAuthOwner,
+ 					TPM_ET_OWNER, &xsap)))
--- a/usr/src/lib/trousers/Patches/tsp_policy.c.patch	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/lib/trousers/Patches/tsp_policy.c.patch	Sun Dec 20 07:12:51 2009 +0200
@@ -1,5 +1,14 @@
---- src/tspi/tsp_policy.c.old	Wed Aug  5 12:54:26 2009
-+++ src/tspi/tsp_policy.c	Wed Aug  5 12:55:35 2009
+--- src/tspi/tsp_policy.c.orig	Mon Aug  3 20:12:36 2009
++++ src/tspi/tsp_policy.c	Tue Oct 27 12:21:10 2009
+@@ -43,7 +43,7 @@
+ {
+ 	BYTE secret[UI_MAX_SECRET_STRING_LENGTH] = { 0 };
+ 	BYTE *dflt = (BYTE *)"TSS Authentication Dialog";
+-	UINT32 secret_len;
++	UINT32 secret_len = 0;
+ 	TSS_RESULT result;
+ 
+ 	if (popup_str == NULL)
 @@ -87,6 +87,8 @@
  		LogWarn("Not pinning secrets in memory due to insufficient perms.");
  		return 0;
--- a/usr/src/pkgdefs/Makefile	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/Makefile	Sun Dec 20 07:12:51 2009 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)Makefile	1.267	09/10/26 SMI"
+# ident	"@(#)Makefile	1.269	09/11/05 SMI"
 #
 
 #
@@ -288,6 +288,8 @@
 	SUNWopenldapr \
 	SUNWopenldapu \
 	SUNWopenssl-commands \
+	SUNWopenssl-fips-140 \
+	SUNWopenssl-fips-140-include \
 	SUNWopenssl-include \
 	SUNWopenssl-libraries \
 	SUNWopenssl-man \
@@ -425,6 +427,7 @@
 	SUNWtcltls \
 	SUNWtcatr \
 	SUNWtcatu \
+	SUNWtcat-examples \
 	SUNWtcsh \
 	SUNWtexi \
 	SUNWtidy \
--- a/usr/src/pkgdefs/SUNWapch22d/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWapch22d/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_com	1.7	09/10/26 SMI"
+# ident	"@(#)prototype_com	1.8	09/11/02 SMI"
 #
 
 #
@@ -89,6 +89,7 @@
 f none usr/apache2/2.2/man/man3/APR::SockAddr.3 0644 root bin
 f none usr/apache2/2.2/man/man3/Apache2::Filter.3 0644 root bin
 f none usr/apache2/2.2/man/man3/Apache2::Connection.3 0644 root bin
+f none usr/apache2/2.2/man/man3/Apache2::ConnectionUtil.3 0644 root bin
 f none usr/apache2/2.2/man/man3/ModPerl::MethodLookup.3 0644 root bin
 f none usr/apache2/2.2/man/man3/APR::Const.3 0644 root bin
 f none usr/apache2/2.2/man/man3/APR::Error.3 0644 root bin
@@ -101,6 +102,7 @@
 f none usr/apache2/2.2/man/man3/Apache2::Log.3 0644 root bin
 f none usr/apache2/2.2/man/man3/APR::Table.3 0644 root bin
 f none usr/apache2/2.2/man/man3/APR::ThreadMutex.3 0644 root bin
+f none usr/apache2/2.2/man/man3/APR::ThreadRWLock.3 0644 root bin
 f none usr/apache2/2.2/man/man3/APR::Status.3 0644 root bin
 f none usr/apache2/2.2/man/man3/Apache2::Command.3 0644 root bin
 f none usr/apache2/2.2/man/man3/Apache2::RequestRec.3 0644 root bin
--- a/usr/src/pkgdefs/SUNWapch22u/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWapch22u/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_com	1.5	09/10/26 SMI"
+# ident	"@(#)prototype_com	1.6	09/11/02 SMI"
 #
 
 #
@@ -108,6 +108,7 @@
 f none usr/apache2/2.2/lib/perl/Apache2/PerlSections/Dump.pm 0555 root bin
 f none usr/apache2/2.2/lib/perl/Apache2/porting.pm 0555 root bin
 f none usr/apache2/2.2/lib/perl/Apache2/Connection.pm 0555 root bin
+f none usr/apache2/2.2/lib/perl/Apache2/ConnectionUtil.pm 0555 root bin
 f none usr/apache2/2.2/lib/perl/Apache2/Module.pm 0555 root bin
 f none usr/apache2/2.2/lib/perl/Apache2/BuildConfig.pm 0555 root bin
 f none usr/apache2/2.2/lib/perl/Apache2/HookRun.pm 0555 root bin
@@ -163,6 +164,9 @@
 d none usr/apache2/2.2/lib/perl/auto/Apache2/Connection 0755 root bin
 f none usr/apache2/2.2/lib/perl/auto/Apache2/Connection/Connection.bs 0555 root bin
 f none usr/apache2/2.2/lib/perl/auto/Apache2/Connection/Connection.so 0555 root bin
+d none usr/apache2/2.2/lib/perl/auto/Apache2/ConnectionUtil 0755 root bin
+f none usr/apache2/2.2/lib/perl/auto/Apache2/ConnectionUtil/ConnectionUtil.bs 0555 root bin
+f none usr/apache2/2.2/lib/perl/auto/Apache2/ConnectionUtil/ConnectionUtil.so 0555 root bin
 f none usr/apache2/2.2/lib/perl/auto/Apache2/typemap 0555 root bin
 d none usr/apache2/2.2/lib/perl/auto/Apache2/RequestIO 0755 root bin
 f none usr/apache2/2.2/lib/perl/auto/Apache2/RequestIO/RequestIO.bs 0555 root bin
@@ -204,6 +208,9 @@
 d none usr/apache2/2.2/lib/perl/auto/APR/ThreadMutex 0755 root bin
 f none usr/apache2/2.2/lib/perl/auto/APR/ThreadMutex/ThreadMutex.so 0555 root bin
 f none usr/apache2/2.2/lib/perl/auto/APR/ThreadMutex/ThreadMutex.bs 0555 root bin
+d none usr/apache2/2.2/lib/perl/auto/APR/ThreadRWLock 0755 root bin
+f none usr/apache2/2.2/lib/perl/auto/APR/ThreadRWLock/ThreadRWLock.so 0555 root bin
+f none usr/apache2/2.2/lib/perl/auto/APR/ThreadRWLock/ThreadRWLock.bs 0555 root bin
 d none usr/apache2/2.2/lib/perl/auto/APR/Date 0755 root bin
 f none usr/apache2/2.2/lib/perl/auto/APR/Date/Date.bs 0555 root bin
 f none usr/apache2/2.2/lib/perl/auto/APR/Date/Date.so 0555 root bin
@@ -288,6 +295,7 @@
 f none usr/apache2/2.2/lib/perl/APR/BucketAlloc.pm 0555 root bin
 f none usr/apache2/2.2/lib/perl/APR/Const.pm 0555 root bin
 f none usr/apache2/2.2/lib/perl/APR/ThreadMutex.pm 0555 root bin
+f none usr/apache2/2.2/lib/perl/APR/ThreadRWLock.pm 0555 root bin
 f none usr/apache2/2.2/lib/perl/APR/IpSubnet.pm 0555 root bin
 f none usr/apache2/2.2/lib/perl/APR/Date.pm 0555 root bin
 f none usr/apache2/2.2/lib/perl/APR/Pool.pm 0555 root bin
--- a/usr/src/pkgdefs/SUNWgnu-emacs-el/copyright	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-el/copyright	Sun Dec 20 07:12:51 2009 +0200
@@ -1,293 +1,635 @@
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
+For the avoidance of doubt, except that if any license choice other than GPL or
+LGPL is available it will apply instead, Sun elects to use only the General
+Public License version 3 (GPLv3) at this time for any software where a choice of
+GPL license versions is made available with the language indicating that GPLv3
+or any later version may be used, or where a choice of which version of the GPL
 is applied is otherwise unspecified.
 ====================================================================
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, 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 or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-  1. You may copy and distribute verbatim copies of the Program's
-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 give any other recipients of the Program a copy of this License
-along with the Program.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-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.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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.
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
 
-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 Program.
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
 
-    a) 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; or,
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
 
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
 
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
 
-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.
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
 
-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.
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 Program
-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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-			    NO WARRANTY
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
 
-  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+  17. Interpretation of Sections 15 and 16.
 
-	    How to Apply These Terms to Your New Programs
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -295,15 +637,15 @@
 
   To do so, attach the following notices to the program.  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
+state 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 program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -311,37 +653,31 @@
     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; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/usr/src/pkgdefs/SUNWgnu-emacs-el/pkginfo.tmpl	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-el/pkginfo.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)pkginfo.tmpl	1.1	08/09/16 SMI"
+# ident	"@(#)pkginfo.tmpl	1.2	09/10/29 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -37,7 +37,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="GNU emacs LISP (.el) files (22.1)"
+DESC="GNU emacs LISP (.el) files (23.1)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWgnu-emacs-el/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-el/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -20,10 +20,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#  ident	"@(#)prototype_com	1.1	08/09/16 SMI"
+#  ident	"@(#)prototype_com	1.2	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -45,1092 +45,1200 @@
 # SUNWgnu-emacs-el
 #
 
+
 d none usr 0755 root sys
 d none usr/share 0755 root sys
 d none usr/share/emacs 0755 root bin
-d none usr/share/emacs/22.1 0755 root bin
-d none usr/share/emacs/22.1/leim 0755 root bin
-d none usr/share/emacs/22.1/leim/ja-dic 0755 root bin
-f none usr/share/emacs/22.1/leim/ja-dic/ja-dic.el.gz 0444 root bin
+d none usr/share/emacs/23.1 0755 root bin
+d none usr/share/emacs/23.1/leim 0755 root bin
+d none usr/share/emacs/23.1/leim/ja-dic 0755 root bin
+f none usr/share/emacs/23.1/leim/ja-dic/ja-dic.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/leim/quail 0755 root bin
-f none usr/share/emacs/22.1/leim/quail/4Corner.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ARRAY30.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/CCDOSPY.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/CTLau-b5.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/CTLau.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ECDICT.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ETZY.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/PY-b5.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/PY.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/Punct-b5.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/Punct.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/QJ-b5.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/QJ.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/SW.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/TONEPY.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ZIRANMA.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ZOZY.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/croatian.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/cyril-jis.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/cyrillic.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/czech.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ethiopic.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/georgian.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/greek.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/hangul.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/hangul3.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/hanja-jis.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/hanja.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/hanja3.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/hebrew.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/indian.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ipa.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/japanese.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/lao.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/latin-alt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/latin-ltx.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/latin-post.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/latin-pre.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/lrt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/py-punct.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/pypunct-b5.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/quick-b5.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/quick-cns.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/rfc1345.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/sgml-input.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/sisheng.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/slovak.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/symbol-ksc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/thai.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/tibetan.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/tsang-b5.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/tsang-cns.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/uni-input.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/viqr.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/vntelex.el.gz 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/welsh.el.gz 0444 root bin
+d none usr/share/emacs/23.1/leim/quail 0755 root bin
+f none usr/share/emacs/23.1/leim/quail/4Corner.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ARRAY30.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/CCDOSPY.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/CTLau-b5.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/CTLau.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ECDICT.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ETZY.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/PY-b5.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/PY.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/Punct-b5.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/Punct.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/QJ-b5.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/QJ.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/SW.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/TONEPY.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ZIRANMA.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ZOZY.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/arabic.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/croatian.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/cyril-jis.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/cyrillic.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/czech.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ethiopic.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/georgian.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/greek.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/hangul.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/hanja-jis.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/hanja.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/hanja3.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/hebrew.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/indian.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ipa.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/japanese.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/lao.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/latin-alt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/latin-ltx.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/latin-post.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/latin-pre.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/lrt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/py-punct.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/pypunct-b5.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/quick-b5.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/quick-cns.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/rfc1345.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/sgml-input.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/sisheng.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/slovak.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/symbol-ksc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/thai.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/tibetan.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/tsang-b5.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/tsang-cns.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/uni-input.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/viqr.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/vntelex.el.gz 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/welsh.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp 0755 root bin
-f none usr/share/emacs/22.1/lisp/abbrev.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/abbrevlist.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/add-log.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/align.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/allout.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ansi-color.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/apropos.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/arc-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/array.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/autoarg.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/autoinsert.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/autorevert.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/avoid.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/battery.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/bindings.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/bookmark.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/bs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/buff-menu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/button.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calculator.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/case-table.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/cdl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/chistory.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/cmuscheme.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/comint.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/compare-w.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/complete.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/completion.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/composite.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/cus-dep.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/cus-edit.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/cus-face.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/cus-start.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/cus-theme.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/custom.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/cvs-status.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/dabbrev.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/delim-col.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/delsel.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/descr-text.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/desktop.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/dframe.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/diff-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/diff.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/dired-aux.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/dired-x.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/dired.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/dirtrack.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/disp-table.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/dnd.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/dos-fns.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/dos-vars.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/dos-w32.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/double.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ebuff-menu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/echistory.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-diff.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-help.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-hook.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-init.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-merg.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-mult.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-ptch.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-vers.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-wind.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/edmacro.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ehelp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/electric.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/elide-head.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lock.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emerge.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/env.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/expand.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ezimage.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/facemenu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/faces.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ffap.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/filecache.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/files.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/filesets.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/find-dired.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/find-file.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/find-lisp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/finder.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/flow-ctrl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/foldout.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/follow.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/font-core.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/font-lock.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/format.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/forms.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/frame.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/fringe.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/generic-x.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/help-at-pt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/help-fns.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/help-macro.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/help-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/help.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/hexl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/hi-lock.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/hilit-chg.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/hippie-exp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/hl-line.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ibuf-ext.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ibuf-macs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ibuffer.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/icomplete.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ido.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ielm.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/iimage.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/image-dired.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/image-file.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/image-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/image.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/imenu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/indent.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/info-look.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/info-xref.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/info.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/informat.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/isearch.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/isearchb.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/iswitchb.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/jit-lock.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/jka-cmpr-hook.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/jka-compr.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/kermit.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/kmacro.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ledit.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/loadhist.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/locate.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/log-edit.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/log-view.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/longlines.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/lpr.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ls-lisp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/macros.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/makesum.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/man.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/master.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/menu-bar.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/midnight.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/minibuf-eldef.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/misc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mouse-copy.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mouse-drag.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mouse-sel.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mouse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/msb.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mwheel.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/newcomment.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/novice.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/outline.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/paren.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcmpl-cvs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcmpl-gnu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcmpl-linux.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcmpl-rpm.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcmpl-unix.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcomplete.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcvs-defs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcvs-info.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcvs-parse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcvs-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcvs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pgg-def.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pgg-gpg.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pgg-parse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pgg-pgp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pgg-pgp5.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/pgg.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/printing.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ps-bdf.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ps-mule.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ps-print.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/recentf.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/rect.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/register.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/repeat.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/replace.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/reposition.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/resume.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/reveal.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/rfn-eshadow.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/rot13.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ruler-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/s-region.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/savehist.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/saveplace.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/sb-image.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/scroll-all.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/scroll-bar.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/scroll-lock.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/select.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/server.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/ses.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/shadowfile.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/shell.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/simple.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/skeleton.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/smerge-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/sort.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/soundex.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/speedbar.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/startup.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/strokes.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/subr.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/t-mouse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/tabify.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/talk.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/tar-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/tempo.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/term.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/terminal.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/thingatpt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/thumbs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/time-stamp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/time.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/timezone.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/tmm.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/tool-bar.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/tooltip.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/tree-widget.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/tutorial.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/type-break.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/uniquify.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/userlock.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-arch.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-cvs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-hooks.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-mcvs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-rcs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-sccs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-svn.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vcursor.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/view.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vms-patch.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vmsproc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vt-control.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/vt100-led.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/w32-fns.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/w32-vars.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/wdired.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/whitespace.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/wid-browse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/wid-edit.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/widget.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/windmove.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/window.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/winner.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/woman.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/x-dnd.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/xml.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/xt-mouse.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp 0755 root bin
+f none usr/share/emacs/23.1/lisp/abbrev.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/abbrevlist.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/add-log.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/align.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/allout.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ansi-color.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/apropos.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/arc-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/array.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/autoarg.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/autoinsert.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/autorevert.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/avoid.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/battery.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/bindings.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/bookmark.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/bs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/buff-menu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/button.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calculator.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/case-table.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/cdl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/chistory.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/cmuscheme.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/comint.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/compare-w.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/complete.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/completion.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/composite.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/cus-dep.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/cus-edit.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/cus-face.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/cus-start.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/cus-theme.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/custom.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/cvs-status.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/dabbrev.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/delim-col.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/delsel.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/descr-text.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/desktop.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/dframe.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/diff-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/diff.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/dired-aux.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/dired-x.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/dired.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/dirtrack.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/disp-table.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/dnd.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/doc-view.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/dos-fns.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/dos-vars.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/dos-w32.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/double.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ebuff-menu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/echistory.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-diff.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-help.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-hook.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-init.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-merg.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-mult.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-ptch.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-vers.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-wind.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/edmacro.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ehelp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/electric.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/elide-head.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lock.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emerge.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/env.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/epa-dired.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/epa-file.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/epa-hook.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/epa-mail.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/epa.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/epg-config.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/epg.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/expand.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ezimage.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/face-remap.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/facemenu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/faces.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ffap.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/filecache.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/files.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/filesets.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/find-cmd.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/find-dired.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/find-file.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/find-lisp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/finder.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/flow-ctrl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/foldout.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/follow.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/font-core.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/font-lock.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/format-spec.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/format.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/forms.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/frame.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/fringe.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/generic-x.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/help-at-pt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/help-fns.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/help-macro.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/help-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/help.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/hex-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/hexl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/hi-lock.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/hilit-chg.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/hippie-exp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/hl-line.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ibuf-ext.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ibuf-macs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ibuffer.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/icomplete.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ido.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ielm.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/iimage.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/image-dired.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/image-file.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/image-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/image.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/imenu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/indent.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/info-look.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/info-xref.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/info.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/informat.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/isearch.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/isearchb.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/iswitchb.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/jit-lock.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/jka-cmpr-hook.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/jka-compr.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/json.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/kermit.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/kmacro.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ledit.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/linum.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/loadhist.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/locate.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/log-edit.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/log-view.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/longlines.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/lpr.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ls-lisp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/macros.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/makesum.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/man.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/master.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mb-depth.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/md4.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/menu-bar.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/midnight.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/minibuf-eldef.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/minibuffer.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/misc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/misearch.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mouse-copy.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mouse-drag.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mouse-sel.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mouse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/msb.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mwheel.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/newcomment.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/novice.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/outline.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/paren.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/password-cache.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcmpl-cvs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcmpl-gnu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcmpl-linux.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcmpl-rpm.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcmpl-unix.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcomplete.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcvs-defs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcvs-info.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcvs-parse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcvs-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcvs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pgg-def.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pgg-gpg.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pgg-parse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pgg-pgp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pgg-pgp5.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/pgg.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/printing.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/proced.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ps-bdf.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ps-def.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ps-mule.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ps-print.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ps-samp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/recentf.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/rect.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/register.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/repeat.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/replace.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/reposition.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/reveal.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/rfn-eshadow.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/rot13.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ruler-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/s-region.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/savehist.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/saveplace.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/sb-image.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/scroll-all.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/scroll-bar.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/scroll-lock.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/select.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/server.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/ses.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/sha1.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/shadowfile.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/shell.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/simple.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/skeleton.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/smerge-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/sort.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/soundex.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/speedbar.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/startup.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/strokes.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/subr.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/t-mouse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/tabify.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/talk.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/tar-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/tempo.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/terminal.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/thingatpt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/thumbs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/time-stamp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/time.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/timezone.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/tmm.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/tool-bar.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/tooltip.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/tree-widget.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/tutorial.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/type-break.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/uniquify.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/userlock.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-annotate.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-arch.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-bzr.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-cvs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-dav.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-dir.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-dispatcher.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-git.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-hg.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-hooks.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-mtn.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-rcs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-sccs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-svn.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vcursor.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/view.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vt-control.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/vt100-led.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/w32-fns.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/w32-vars.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/wdired.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/whitespace.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/wid-browse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/wid-edit.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/widget.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/windmove.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/window.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/winner.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/woman.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/x-dnd.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/xml.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/xt-mouse.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/calc 0755 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-aent.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-alg.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-arith.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-bin.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-comb.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-cplx.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-embed.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-ext.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-fin.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-forms.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-frac.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-funcs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-graph.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-help.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-incom.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-keypd.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-lang.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-macs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-map.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-math.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-misc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-mtx.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-poly.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-prog.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-rewr.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-rules.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-sel.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-stat.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-store.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-stuff.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-trail.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-undo.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-units.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-vec.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-yank.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calcalg2.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calcalg3.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calccomp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calcsel2.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/calc 0755 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-aent.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-alg.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-arith.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-bin.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-comb.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-cplx.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-embed.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-ext.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-fin.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-forms.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-frac.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-funcs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-graph.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-help.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-incom.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-keypd.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-lang.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-macs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-map.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-math.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-menu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-misc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-mtx.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-nlfit.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-poly.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-prog.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-rewr.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-rules.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-sel.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-stat.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-store.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-stuff.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-trail.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-undo.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-units.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-vec.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-yank.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calcalg2.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calcalg3.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calccomp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calcsel2.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/calendar 0755 root bin
-f none usr/share/emacs/22.1/lisp/calendar/appt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-bahai.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-china.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-coptic.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-dst.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-french.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-hebrew.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-html.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-islam.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-iso.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-julian.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-mayan.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-menu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-move.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-persia.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-tex.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-x.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/calendar.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/diary-lib.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/holidays.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/icalendar.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/lunar.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/parse-time.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/solar.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/time-date.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/timeclock.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/todo-mode.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/calendar 0755 root bin
+f none usr/share/emacs/23.1/lisp/calendar/appt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-bahai.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-china.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-coptic.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-dst.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-french.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-hebrew.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-html.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-islam.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-iso.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-julian.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-mayan.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-menu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-move.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-persia.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-tex.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-x.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/calendar.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/diary-lib.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/holidays.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/icalendar.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/lunar.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/parse-time.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/solar.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/time-date.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/timeclock.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/todo-mode.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/emacs-lisp 0755 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/advice.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/assoc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/authors.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/autoload.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/backquote.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/benchmark.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/bindat.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/byte-opt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/byte-run.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/bytecomp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/checkdoc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl-compat.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl-extra.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl-indent.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl-macs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl-seq.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/copyright.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/crm.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cust-print.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/debug.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/derived.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/disass.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/easy-mmode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/easymenu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/edebug.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/eldoc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/elint.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/elp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/ewoc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/find-func.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/find-gc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/float-sup.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/generic.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/gulp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/helper.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/levents.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/lisp-mnt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/lisp-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/lisp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/lmenu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/lselect.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/lucid.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/macroexp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/map-ynp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/pp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/re-builder.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/regexp-opt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/regi.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/ring.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/rx.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/shadow.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/sregex.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/syntax.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/tcover-ses.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/tcover-unsafep.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/testcover.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/timer.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/tq.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/trace.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/unsafep.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/warnings.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/emacs-lisp 0755 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/advice.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/assoc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/authors.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/autoload.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/avl-tree.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/backquote.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/benchmark.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/bindat.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/byte-opt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/byte-run.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/bytecomp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/check-declare.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/checkdoc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl-compat.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl-extra.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl-indent.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl-macs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl-seq.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/copyright.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/crm.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cust-print.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/debug.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/derived.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/disass.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/easy-mmode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/easymenu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/edebug.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/eldoc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/elint.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/elp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/ewoc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/find-func.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/find-gc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/float-sup.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/generic.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/gulp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/helper.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/levents.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/lisp-mnt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/lisp-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/lisp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/lmenu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/lucid.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/macroexp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/map-ynp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/pp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/re-builder.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/regexp-opt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/regi.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/ring.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/rx.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/shadow.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/sregex.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/syntax.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/tcover-ses.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/tcover-unsafep.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/testcover.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/timer.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/tq.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/trace.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/unsafep.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/warnings.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/emulation 0755 root bin
-f none usr/share/emacs/22.1/lisp/emulation/crisp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/cua-base.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/cua-gmrk.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/cua-rect.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/edt-lk201.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/edt-mapper.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/edt-pc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/edt-vt100.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/edt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/keypad.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/pc-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/pc-select.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/tpu-edt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/tpu-extras.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/tpu-mapper.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/vi.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/vip.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-cmd.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-ex.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-init.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-keym.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-macs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-mous.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/ws-mode.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/emulation 0755 root bin
+f none usr/share/emacs/23.1/lisp/emulation/crisp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/cua-base.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/cua-gmrk.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/cua-rect.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/edt-lk201.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/edt-mapper.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/edt-pc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/edt-vt100.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/edt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/keypad.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/pc-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/pc-select.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/tpu-edt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/tpu-extras.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/tpu-mapper.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/vi.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/vip.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-cmd.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-ex.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-init.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-keym.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-macs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-mous.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/ws-mode.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/erc 0755 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-autoaway.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-backend.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-button.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-capab.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-compat.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-dcc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-ezbounce.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-fill.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-goodies.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-hecomplete.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-ibuffer.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-identd.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-imenu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-join.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-lang.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-log.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-match.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-menu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-netsplit.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-networks.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-nicklist.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-notify.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-page.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-pcomplete.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-replace.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-ring.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-services.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-sound.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-speedbar.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-spelling.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-stamp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-track.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-truncate.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-xdcc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/erc 0755 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-autoaway.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-backend.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-button.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-capab.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-compat.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-dcc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-ezbounce.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-fill.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-goodies.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-hecomplete.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-ibuffer.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-identd.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-imenu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-join.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-lang.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-list.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-log.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-match.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-menu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-netsplit.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-networks.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-notify.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-page.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-pcomplete.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-replace.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-ring.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-services.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-sound.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-speedbar.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-spelling.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-stamp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-track.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-truncate.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-xdcc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc.el.gz 0444 root bin
+
+
+d none usr/share/emacs/23.1/lisp/eshell 0755 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-alias.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-banner.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-basic.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-cmpl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-dirs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-glob.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-hist.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-ls.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-pred.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-prompt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-rebind.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-script.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-smart.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-term.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-unix.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-xtra.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-arg.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-cmd.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-ext.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-io.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-module.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-opt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-proc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-test.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-var.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/eshell.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/eshell 0755 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-alias.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-banner.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-basic.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-cmpl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-dirs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-glob.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-hist.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-ls.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-pred.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-prompt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-rebind.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-script.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-smart.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-term.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-unix.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-xtra.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-arg.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-cmd.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-ext.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-io.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-module.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-opt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-proc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-test.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-var.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/eshell.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/gnus 0755 root bin
+f none usr/share/emacs/23.1/lisp/gnus/auth-source.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/canlock.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/compface.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/deuglify.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/earcon.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/ecomplete.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/flow-fill.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gmm-utils.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-agent.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-art.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-async.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-audio.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-bcklg.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-bookmark.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-cache.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-cite.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-cus.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-delay.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-demon.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-diary.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-dired.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-draft.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-dup.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-eform.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-ems.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-fun.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-group.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-int.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-kill.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-logic.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-mh.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-ml.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-mlspl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-move.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-msg.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-nocem.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-picon.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-range.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-registry.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-salt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-score.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-setup.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-sieve.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-soup.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-spec.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-srvr.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-start.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-sum.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-topic.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-undo.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-uu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-vm.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-win.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/html2text.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/ietf-drums.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/legacy-gnus-agent.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mail-parse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mail-prsvr.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mail-source.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mailcap.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/message.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/messcompat.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-bodies.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-decode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-encode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-extern.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-partial.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-url.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-uu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-view.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mml-sec.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mml-smime.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mml.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mml1991.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mml2015.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnagent.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnbabyl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nndb.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nndiary.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nndir.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nndoc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nndraft.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nneething.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnfolder.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nngateway.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnheader.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnimap.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnir.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnkiboze.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnlistserv.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnmail.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnmaildir.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnmairix.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnmbox.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnmh.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnml.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnnil.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnoo.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnrss.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnslashdot.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnsoup.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnspool.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nntp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnultimate.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnvirtual.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnwarchive.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnweb.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnwfm.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/pop3.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/qp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/rfc1843.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/rfc2045.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/rfc2047.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/rfc2104.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/rfc2231.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/score-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/sieve-manage.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/sieve-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/sieve.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/smiley.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/smime.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/spam-report.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/spam-stat.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/spam-wash.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/spam.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/starttls.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/utf7.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/webmail.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/yenc.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/gnus 0755 root bin
-f none usr/share/emacs/22.1/lisp/gnus/binhex.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/canlock.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/compface.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/deuglify.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/dig.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/dns.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/earcon.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/flow-fill.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/format-spec.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gmm-utils.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-agent.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-art.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-async.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-audio.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-bcklg.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-cache.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-cite.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-cus.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-delay.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-demon.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-diary.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-dired.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-draft.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-dup.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-eform.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-ems.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-fun.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-gl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-group.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-int.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-kill.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-logic.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-mh.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-ml.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-mlspl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-move.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-msg.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-nocem.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-picon.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-range.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-registry.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-salt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-score.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-setup.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-sieve.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-soup.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-spec.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-srvr.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-start.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-sum.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-topic.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-undo.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-uu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-vm.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-win.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/hex-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/html2text.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/ietf-drums.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/imap.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/legacy-gnus-agent.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mail-parse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mail-prsvr.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mail-source.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mailcap.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/message.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/messcompat.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-bodies.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-decode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-encode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-extern.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-partial.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-url.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-uu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-view.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mml-sec.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mml-smime.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mml.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mml1991.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mml2015.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnagent.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnbabyl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nndb.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nndiary.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nndir.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nndoc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nndraft.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nneething.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnfolder.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nngateway.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnheader.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnimap.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnkiboze.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnlistserv.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnmail.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnmaildir.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnmbox.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnmh.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnml.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnnil.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnoo.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnrss.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnslashdot.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnsoup.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnspool.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nntp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnultimate.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnvirtual.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnwarchive.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnweb.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnwfm.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/pop3.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/qp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/rfc1843.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/rfc2045.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/rfc2047.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/rfc2104.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/rfc2231.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/score-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/sha1.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/sieve-manage.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/sieve-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/sieve.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/smiley.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/smime.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/spam-report.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/spam-stat.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/spam.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/starttls.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/utf7.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/uudecode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/webmail.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/yenc.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/international 0755 root bin
+f none usr/share/emacs/23.1/lisp/international/ccl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/characters.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/encoded-kb.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/fontset.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/isearch-x.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/iso-ascii.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/iso-cvt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/iso-transl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/ja-dic-cnv.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/ja-dic-utl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/kinsoku.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/kkc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/latexenc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/latin1-disp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/mule-cmds.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/mule-diag.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/mule-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/mule.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/ogonek.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/quail.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/robin.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/titdic-cnv.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/utf-7.el.gz 0444 root bin
+
+
+d none usr/share/emacs/23.1/lisp/language 0755 root bin
+f none usr/share/emacs/23.1/lisp/language/china-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/chinese.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/cyril-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/cyrillic.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/ethio-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/ethiopic.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/european.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/hanja-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/ind-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/indian.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/japan-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/korea-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/lao-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/thai-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/thai-word.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/tibet-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/tibetan.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/tv-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/viet-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/vietnamese.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/international 0755 root bin
-f none usr/share/emacs/22.1/lisp/international/ccl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/characters.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/code-pages.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/codepage.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/encoded-kb.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/fontset.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/isearch-x.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/iso-ascii.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/iso-cvt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/iso-transl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/ja-dic-cnv.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/ja-dic-utl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/kinsoku.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/kkc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/latexenc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/latin1-disp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/mule-cmds.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/mule-diag.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/mule-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/mule.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/ogonek.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/quail.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/subst-big5.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/subst-gb2312.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/subst-jis.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/subst-ksc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/titdic-cnv.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/ucs-tables.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/utf-16.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/utf-7.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/utf-8.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/mail 0755 root bin
+f none usr/share/emacs/23.1/lisp/mail/binhex.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/emacsbug.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/feedmail.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/footnote.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/hashcash.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mail-extr.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mail-hist.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mail-utils.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mailabbrev.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mailalias.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mailclient.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mailheader.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mailpost.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/metamail.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mspools.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/reporter.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rfc2368.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rfc822.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmail-spam-filter.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmail.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailedit.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailkwd.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailmm.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailmsc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailout.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailsort.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailsum.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/sendmail.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/smtpmail.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/supercite.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/uce.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/undigest.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/unrmail.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/uudecode.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/language 0755 root bin
-f none usr/share/emacs/22.1/lisp/language/china-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/chinese.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/cyril-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/cyrillic.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/devan-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/ethio-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/ethiopic.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/european.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/ind-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/indian.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/japan-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/knd-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/korea-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/lao-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/mlm-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/thai-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/thai-word.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/tibet-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/tibetan.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/tml-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/viet-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/vietnamese.el.gz 0444 root bin
-
-
-d none usr/share/emacs/22.1/lisp/mail 0755 root bin
-f none usr/share/emacs/22.1/lisp/mail/emacsbug.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/feedmail.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/footnote.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mail-extr.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mail-hist.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mail-utils.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mailabbrev.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mailalias.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mailclient.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mailheader.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mailpost.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/metamail.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mspools.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/reporter.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rfc2368.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rfc822.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmail-spam-filter.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmail.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmailedit.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmailkwd.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmailmsc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmailout.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmailsort.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmailsum.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/sendmail.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/smtpmail.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/supercite.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/uce.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/undigest.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/unrmail.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/vms-pmail.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/mh-e 0755 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-alias.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-buffers.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-comp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-e.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-folder.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-funcs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-identity.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-inc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-junk.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-letter.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-limit.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-mime.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-print.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-scan.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-search.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-seq.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-show.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-speed.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-thread.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-tool-bar.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-utils.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-xface.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/mh-e 0755 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-alias.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-buffers.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-comp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-e.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-folder.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-funcs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-identity.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-inc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-junk.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-letter.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-limit.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-mime.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-print.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-scan.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-search.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-seq.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-show.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-speed.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-thread.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-tool-bar.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-utils.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-xface.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/net 0755 root bin
+f none usr/share/emacs/23.1/lisp/net/ange-ftp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/browse-url.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/dbus.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/dig.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/dns.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudc-bob.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudc-export.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudc-hotlist.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudc-vars.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudcb-bbdb.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudcb-ldap.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudcb-mab.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudcb-ph.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/goto-addr.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/hmac-def.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/hmac-md5.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/imap.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/ldap.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/mairix.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/net-utils.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/netrc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/newst-backend.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/newst-plainview.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/newst-reader.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/newst-ticker.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/newst-treeview.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/newsticker.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/ntlm.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/quickurl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/rcirc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/rcompile.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/rlogin.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/sasl-cram.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/sasl-digest.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/sasl-ntlm.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/sasl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/snmp-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/socks.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/telnet.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tls.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-cache.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-cmds.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-compat.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-fish.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-ftp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-gw.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-smb.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-uu.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/trampver.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/webjump.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/xesam.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/zeroconf.el.gz 0444 root bin
+
+
+d none usr/share/emacs/23.1/lisp/nxml 0755 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-enc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-glyph.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-maint.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-ns.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-outln.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-parse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-rap.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-uchnm.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-cmpct.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-dt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-loc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-maint.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-match.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-nxml.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-parse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-pttrn.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-uri.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-valid.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-xsd.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/xmltok.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/xsd-regexp.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/net 0755 root bin
-f none usr/share/emacs/22.1/lisp/net/ange-ftp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/browse-url.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudc-bob.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudc-export.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudc-hotlist.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudc-vars.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudcb-bbdb.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudcb-ldap.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudcb-mab.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudcb-ph.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/goto-addr.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/ldap.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/net-utils.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/netrc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/newsticker.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/quickurl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/rcirc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/rcompile.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/rlogin.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/snmp-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/telnet.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tls.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tramp-ftp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tramp-smb.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tramp-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tramp-uu.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tramp-vc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tramp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/trampver.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/webjump.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/obsolete 0755 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/awk-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/fast-lock.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/iso-acc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/iso-insert.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/iso-swed.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/lazy-lock.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/old-whitespace.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/options.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/resume.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/rnews.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/rnewspost.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/sc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/scribe.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/swedish.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/vc-mcvs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/x-menu.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/obsolete 0755 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/auto-show.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/awk-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/bg-mouse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/fast-lock.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/float.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/hilit19.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/hscroll.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/iso-acc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/iso-insert.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/iso-swed.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/lazy-lock.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/mlsupport.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/ooutline.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/options.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/profile.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/rnews.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/rnewspost.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/rsz-mini.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/sc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/scribe.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/sun-curs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/sun-fns.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/swedish.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/uncompress.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/x-apollo.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/x-menu.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/org 0755 root bin
+f none usr/share/emacs/23.1/lisp/org/org-agenda.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-archive.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-attach.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-bbdb.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-bibtex.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-clock.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-colview.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-compat.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-exp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-export-latex.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-faces.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-footnote.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-gnus.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-id.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-info.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-install.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-irc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-jsinfo.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-list.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-mac-message.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-macs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-mew.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-mhe.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-mouse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-plot.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-publish.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-remember.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-rmail.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-table.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-timer.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-vm.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-w3m.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-wl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/play 0755 root bin
-f none usr/share/emacs/22.1/lisp/play/5x5.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/animate.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/blackbox.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/cookie1.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/decipher.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/dissociate.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/doctor.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/dunnet.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/fortune.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/gamegrid.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/gametree.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/gomoku.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/handwrite.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/hanoi.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/landmark.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/life.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/meese.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/morse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/mpuz.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/pong.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/snake.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/solitaire.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/spook.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/studly.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/tetris.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/yow.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/zone.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/play 0755 root bin
+f none usr/share/emacs/23.1/lisp/play/5x5.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/animate.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/blackbox.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/bubbles.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/cookie1.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/decipher.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/dissociate.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/doctor.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/dunnet.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/fortune.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/gamegrid.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/gametree.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/gomoku.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/handwrite.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/hanoi.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/landmark.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/life.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/meese.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/morse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/mpuz.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/pong.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/snake.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/solitaire.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/spook.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/studly.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/tetris.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/yow.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/zone.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/progmodes 0755 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ada-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ada-prj.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ada-stmt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ada-xref.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/antlr-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/asm-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/autoconf.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-align.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-awk.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-bytecomp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-cmds.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-compat.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-defs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-engine.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-fonts.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-langs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-menus.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-styles.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-subword.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-vars.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cfengine.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cmacexp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/compile.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cperl-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cpp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cwarn.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/dcl-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/delphi.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-abn.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-bnf.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-dtd.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-ebx.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-iso.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-otz.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-yac.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf2ps.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebrowse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/etags.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/executable.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/f90.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/flymake.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/fortran.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/gdb-ui.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/glasses.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/grep.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/gud.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/hideif.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/hideshow.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/icon.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/idlw-complete-structtag.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/idlw-help.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/idlw-shell.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/idlw-toolbar.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/idlwave.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/inf-lisp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ld-script.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/m4-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/make-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/mantemp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/meta-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/mixal-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/modula2.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/octave-hlp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/octave-inf.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/octave-mod.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/pascal.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/perl-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/prolog.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ps-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/python.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/scheme.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/sh-script.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/simula.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/sql.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/tcl.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/vhdl-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/which-func.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/xscheme.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/progmodes 0755 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ada-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ada-prj.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ada-stmt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ada-xref.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/antlr-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/asm-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/autoconf.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/bug-reference.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cap-words.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-align.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-awk.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-bytecomp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-cmds.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-compat.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-defs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-engine.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-fonts.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-langs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-menus.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-styles.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-subword.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-vars.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cfengine.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cmacexp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/compile.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cperl-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cpp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cwarn.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/dcl-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/delphi.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-abn.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-bnf.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-dtd.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-ebx.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-iso.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-otz.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-yac.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf2ps.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebrowse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/etags.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/executable.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/f90.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/flymake.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/fortran.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/gdb-ui.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/glasses.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/grep.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/gud.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/hideif.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/hideshow.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/icon.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/idlw-complete-structtag.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/idlw-help.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/idlw-shell.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/idlw-toolbar.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/idlwave.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/inf-lisp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ld-script.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/m4-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/make-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/mantemp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/meta-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/mixal-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/modula2.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/octave-inf.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/octave-mod.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/pascal.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/perl-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/prolog.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ps-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/python.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ruby-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/scheme.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/sh-script.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/simula.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/sql.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/sym-comp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/tcl.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/vera-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/verilog-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/vhdl-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/which-func.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/xscheme.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/term 0755 root bin
-f none usr/share/emacs/22.1/lisp/term/mac-win.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/pc-win.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/rxvt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/sun-mouse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/sun.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/sup-mouse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/tty-colors.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/tvi970.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/vt100.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/w32-win.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/x-win.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/xterm.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/term 0755 root bin
+f none usr/share/emacs/23.1/lisp/term/common-win.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/internal.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/ns-win.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/pc-win.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/rxvt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/sun.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/sup-mouse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/tty-colors.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/tvi970.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/vt100.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/w32-win.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/w32console.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/x-win.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/xterm.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/textmodes 0755 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/artist.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/bib-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/bibtex.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/conf-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/dns-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/enriched.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/fill.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/flyspell.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/ispell.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/makeinfo.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/nroff-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/org.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/page-ext.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/page.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/paragraphs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/picture.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/po.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/refbib.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/refer.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/refill.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-auc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-cite.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-dcr.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-global.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-index.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-parse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-ref.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-sel.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-toc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-vars.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/sgml-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/spell.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/table.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/tex-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/texinfmt.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/texinfo.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/texnfo-upd.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/text-mode.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/tildify.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/two-column.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/underline.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/textmodes 0755 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/artist.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/bib-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/bibtex-style.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/bibtex.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/conf-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/css-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/dns-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/enriched.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/fill.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/flyspell.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/ispell.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/makeinfo.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/nroff-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/page-ext.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/page.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/paragraphs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/picture.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/po.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/refbib.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/refer.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/refill.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-auc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-cite.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-dcr.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-global.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-index.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-parse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-ref.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-sel.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-toc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-vars.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/remember.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/rst.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/sgml-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/spell.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/table.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/tex-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/texinfmt.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/texinfo.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/texnfo-upd.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/text-mode.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/tildify.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/two-column.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/underline.el.gz 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/url 0755 root bin
-f none usr/share/emacs/22.1/lisp/url/url-about.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-auth.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-cache.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-cid.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-cookie.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-dav.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-dired.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-expand.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-file.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-ftp.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-gw.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-handlers.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-history.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-http.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-imap.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-irc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-ldap.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-mailto.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-methods.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-misc.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-news.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-nfs.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-ns.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-parse.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-privacy.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-proxy.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-util.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-vars.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url.el.gz 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/vc-dav.el.gz 0444 root bin
+d none usr/share/emacs/23.1/lisp/url 0755 root bin
+f none usr/share/emacs/23.1/lisp/url/url-about.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-auth.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-cache.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-cid.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-cookie.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-dav.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-dired.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-expand.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-file.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-ftp.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-gw.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-handlers.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-history.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-http.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-imap.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-irc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-ldap.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-mailto.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-methods.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-misc.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-news.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-nfs.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-ns.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-parse.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-privacy.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-proxy.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-util.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-vars.el.gz 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url.el.gz 0444 root bin
--- a/usr/src/pkgdefs/SUNWgnu-emacs-gtk/copyright	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-gtk/copyright	Sun Dec 20 07:12:51 2009 +0200
@@ -1,293 +1,635 @@
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
+For the avoidance of doubt, except that if any license choice other than GPL or
+LGPL is available it will apply instead, Sun elects to use only the General
+Public License version 3 (GPLv3) at this time for any software where a choice of
+GPL license versions is made available with the language indicating that GPLv3
+or any later version may be used, or where a choice of which version of the GPL
 is applied is otherwise unspecified.
 ====================================================================
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, 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 or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-  1. You may copy and distribute verbatim copies of the Program's
-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 give any other recipients of the Program a copy of this License
-along with the Program.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-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.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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.
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
 
-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 Program.
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
 
-    a) 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; or,
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
 
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
 
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
 
-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.
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
 
-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.
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 Program
-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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-			    NO WARRANTY
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
 
-  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+  17. Interpretation of Sections 15 and 16.
 
-	    How to Apply These Terms to Your New Programs
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -295,15 +637,15 @@
 
   To do so, attach the following notices to the program.  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
+state 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 program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -311,37 +653,31 @@
     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; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/usr/src/pkgdefs/SUNWgnu-emacs-gtk/depend	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-gtk/depend	Sun Dec 20 07:12:51 2009 +0200
@@ -17,7 +17,7 @@
 #
 # CDDL HEADER END
 #
-#  ident	"@(#)depend	1.2	09/05/21 SMI"
+#  ident	"@(#)depend	1.3	09/10/29 SMI"
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -50,27 +50,25 @@
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
 
-P SUNWcslr	Core Solaris Libraries (Root)
-P SUNWfontconfig	Fontconfig library
-P SUNWfreetype2	FreeType2 Font library
 P SUNWgnu-emacs	GNU emacs core
-P SUNWjpg	jpeg - The Independent JPEG Groups JPEG software
-P SUNWlexpt	XML parser library
-P SUNWlibms	Math & Microtasking Libraries (Usr)
-P SUNWlibmsr	Math & Microtasking Libraries (Root)
-P SUNWmlib	mediaLib - Shared Libraries
-P SUNWmlibl	mediaLib - Library Links
-P SUNWpng	Portable Network Graphics library
-P SUNWTiff	libtiff - library for reading and writing TIFF
-P SUNWxorg-clientlibs	X.Org Foundation X Client Libraries
-P SUNWxwice	X Window System Inter-Client Exchange (ICE) Components
-P SUNWxwplt	X Window System platform software
-P SUNWxwrtl	X Window System & Graphics Runtime Library Links in /usr/lib
-P SUNWxwxft	Xft (X Freetype) Library
-P SUNWzlib	The Zip compression library
-P SUNWzlibr	The Zip compression library (Root)
-P SUNWcairo	Vector graphics library
-P SUNWpango	GNOME core text and font handling libraries
-P SUNWglib2	GNOME core libraries
-P SUNWgtk2	GTK+ - GIMP toolkit libraries
-P SUNWlibatk	GNOME accesibility toolkit libraries
+
+P SUNWcairo     Vector graphics library
+P SUNWcslr      Core Solaris Libraries (Root)
+P SUNWdbus-libs Simple IPC library based on messages - client libraries
+P SUNWfontconfig        Fontconfig library
+P SUNWfreetype2 FreeType2 Font library
+P SUNWglib2     GNOME core libraries
+P SUNWgtk2      GTK+ - GIMP toolkit libraries
+P SUNWjpg       jpeg - The Independent JPEG Groups JPEG software
+P SUNWlibatk    GNOME accesibility toolkit libraries
+P SUNWlibmsr    Math & Microtasking Libraries (Root)
+P SUNWlibrsvg   SVG-format scalable graphics support library
+P SUNWmlib      mediaLib - Shared Libraries
+P SUNWpango     GNOME core text and font handling libraries
+P SUNWpng       Portable Network Graphics library
+P SUNWTiff      libtiff - library for reading and writing TIFF
+P SUNWxorg-clientlibs   X.Org Foundation X Client Libraries
+P SUNWxwice     X Window System Inter-Client Exchange (ICE) Components
+P SUNWxwplt     X Window System platform software
+P SUNWxwxft     Xft (X Freetype) Library
+P SUNWzlibr     The Zip compression library (Root)
--- a/usr/src/pkgdefs/SUNWgnu-emacs-gtk/pkginfo.tmpl	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-gtk/pkginfo.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)pkginfo.tmpl	1.1	08/09/16 SMI"
+# ident	"@(#)pkginfo.tmpl	1.2	09/10/29 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -37,7 +37,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="GNU emacs binaries with X11 support (GTK toolkit) (22.1)"
+DESC="GNU emacs binaries with X11 support (GTK toolkit) (23.1)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWgnu-emacs-gtk/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-gtk/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -20,10 +20,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_com	1.1	08/09/16 SMI"
+# ident	"@(#)prototype_com	1.2	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -48,8 +48,9 @@
 
 d none usr 0755 root sys
 d none usr/bin 0755 root bin
-l none usr/bin/emacs-gtk-22.1=../../usr/lib/isaexec
-l none usr/bin/emacs-gtk=../../usr/lib/isaexec
+l none usr/bin/emacs-gtk=../lib/isaexec
+l none usr/bin/emacs-gtk-23.1=../lib/isaexec
+
 
 d none usr/share 0755 root sys
 d none usr/share/man 0755 root bin
--- a/usr/src/pkgdefs/SUNWgnu-emacs-gtk/prototype_i386	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-gtk/prototype_i386	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_i386	1.1	08/09/16 SMI"
+# ident	"@(#)prototype_i386	1.2	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -49,11 +49,12 @@
 # SUNWgnu-emacs-gtk
 #
 
+
 d none usr/bin/i86 0755 root bin
-f none usr/bin/i86/emacs-gtk-22.1 0555 root bin
-l none usr/bin/i86/emacs-gtk=emacs-gtk-22.1
+f none usr/bin/i86/emacs-gtk-23.1 0555 root bin
+l none usr/bin/i86/emacs-gtk=emacs-gtk-23.1
 
 
 d none usr/bin/amd64 0755 root bin
-f none usr/bin/amd64/emacs-gtk-22.1 0555 root bin
-l none usr/bin/amd64/emacs-gtk=emacs-gtk-22.1
+f none usr/bin/amd64/emacs-gtk-23.1 0555 root bin
+l none usr/bin/amd64/emacs-gtk=emacs-gtk-23.1
--- a/usr/src/pkgdefs/SUNWgnu-emacs-gtk/prototype_sparc	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-gtk/prototype_sparc	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_sparc	1.1	08/09/16 SMI"
+# ident	"@(#)prototype_sparc	1.2	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -49,12 +49,12 @@
 # SUNWgnu-emacs-gtk
 #
 
+
 d none usr/bin/sparcv7 0755 root bin
-f none usr/bin/sparcv7/emacs-gtk-22.1 0555 root bin
-l none usr/bin/sparcv7/emacs-gtk=emacs-gtk-22.1
+f none usr/bin/sparcv7/emacs-gtk-23.1 0555 root bin
+l none usr/bin/sparcv7/emacs-gtk=emacs-gtk-23.1
 
 
-# Placeholders for eventual deliver of 64-bit version
-#d none usr/bin/sparcv9 0755 root bin
-#f none usr/bin/sparcv9/emacs-gtk-22.1 0555 root bin
-#l none usr/bin/sparcv9/emacs-gtk=emacs-gtk-22.1
+d none usr/bin/sparcv9 0755 root bin
+f none usr/bin/sparcv9/emacs-gtk-23.1 0555 root bin
+l none usr/bin/sparcv9/emacs-gtk=emacs-gtk-23.1
--- a/usr/src/pkgdefs/SUNWgnu-emacs-nox/copyright	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-nox/copyright	Sun Dec 20 07:12:51 2009 +0200
@@ -1,293 +1,635 @@
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
+For the avoidance of doubt, except that if any license choice other than GPL or
+LGPL is available it will apply instead, Sun elects to use only the General
+Public License version 3 (GPLv3) at this time for any software where a choice of
+GPL license versions is made available with the language indicating that GPLv3
+or any later version may be used, or where a choice of which version of the GPL
 is applied is otherwise unspecified.
 ====================================================================
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, 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 or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-  1. You may copy and distribute verbatim copies of the Program's
-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 give any other recipients of the Program a copy of this License
-along with the Program.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-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.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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.
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
 
-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 Program.
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
 
-    a) 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; or,
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
 
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
 
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
 
-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.
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
 
-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.
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 Program
-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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-			    NO WARRANTY
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
 
-  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+  17. Interpretation of Sections 15 and 16.
 
-	    How to Apply These Terms to Your New Programs
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -295,15 +637,15 @@
 
   To do so, attach the following notices to the program.  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
+state 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 program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -311,37 +653,31 @@
     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; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/usr/src/pkgdefs/SUNWgnu-emacs-nox/depend	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-nox/depend	Sun Dec 20 07:12:51 2009 +0200
@@ -17,9 +17,9 @@
 #
 # CDDL HEADER END
 #
-#  ident	"@(#)depend	1.1	08/09/16 SMI"
+#  ident	"@(#)depend	1.2	09/10/29 SMI"
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -50,7 +50,8 @@
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
 
-P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWgnu-emacs	GNU emacs core
-P SUNWlibms	Math & Microtasking Libraries (Usr)
-P SUNWlibmsr	Math & Microtasking Libraries (Root)
+
+P SUNWcslr      Core Solaris Libraries (Root)
+P SUNWdbus-libs Simple IPC library based on messages - client libraries
+P SUNWlibmsr    Math & Microtasking Libraries (Root)
--- a/usr/src/pkgdefs/SUNWgnu-emacs-nox/pkginfo.tmpl	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-nox/pkginfo.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)pkginfo.tmpl	1.1	08/09/16 SMI"
+# ident	"@(#)pkginfo.tmpl	1.2	09/10/29 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -37,7 +37,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="GNU emacs binaries without X Window System support (22.1)"
+DESC="GNU emacs binaries without X Window System support (23.1)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWgnu-emacs-nox/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-nox/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -20,10 +20,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#  ident	"@(#)prototype_com	1.1	08/09/16 SMI"
+#  ident	"@(#)prototype_com	1.2	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -48,8 +48,9 @@
 
 d none usr 0755 root sys
 d none usr/bin 0755 root bin
-l none usr/bin/emacs-nox-22.1=../../usr/lib/isaexec
-l none usr/bin/emacs-nox=../../usr/lib/isaexec
+l none usr/bin/emacs-nox=../lib/isaexec
+l none usr/bin/emacs-nox-23.1=../lib/isaexec
+
 
 d none usr/share 0755 root sys
 d none usr/share/man 0755 root bin
--- a/usr/src/pkgdefs/SUNWgnu-emacs-nox/prototype_i386	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-nox/prototype_i386	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_i386	1.1	08/09/16 SMI"
+# ident	"@(#)prototype_i386	1.2	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -49,11 +49,12 @@
 # SUNWgnu-emacs-nox
 #
 
+
 d none usr/bin/i86 0755 root bin
-f none usr/bin/i86/emacs-nox-22.1 0555 root bin
-l none usr/bin/i86/emacs-nox=emacs-nox-22.1
+f none usr/bin/i86/emacs-nox-23.1 0555 root bin
+l none usr/bin/i86/emacs-nox=emacs-nox-23.1
 
 
 d none usr/bin/amd64 0755 root bin
-f none usr/bin/amd64/emacs-nox-22.1 0555 root bin
-l none usr/bin/amd64/emacs-nox=emacs-nox-22.1
+f none usr/bin/amd64/emacs-nox-23.1 0555 root bin
+l none usr/bin/amd64/emacs-nox=emacs-nox-23.1
--- a/usr/src/pkgdefs/SUNWgnu-emacs-nox/prototype_sparc	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-nox/prototype_sparc	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_sparc	1.1	08/09/16 SMI"
+# ident	"@(#)prototype_sparc	1.2	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -49,11 +49,12 @@
 # SUNWgnu-emacs-nox
 #
 
+
 d none usr/bin/sparcv7 0755 root bin
-f none usr/bin/sparcv7/emacs-nox-22.1 0555 root bin
-l none usr/bin/sparcv7/emacs-nox=emacs-nox-22.1
+f none usr/bin/sparcv7/emacs-nox-23.1 0555 root bin
+l none usr/bin/sparcv7/emacs-nox=emacs-nox-23.1
 
 
 d none usr/bin/sparcv9 0755 root bin
-f none usr/bin/sparcv9/emacs-nox-22.1 0555 root bin
-l none usr/bin/sparcv9/emacs-nox=emacs-nox-22.1
+f none usr/bin/sparcv9/emacs-nox-23.1 0555 root bin
+l none usr/bin/sparcv9/emacs-nox=emacs-nox-23.1
--- a/usr/src/pkgdefs/SUNWgnu-emacs-x/copyright	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-x/copyright	Sun Dec 20 07:12:51 2009 +0200
@@ -1,293 +1,635 @@
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
+For the avoidance of doubt, except that if any license choice other than GPL or
+LGPL is available it will apply instead, Sun elects to use only the General
+Public License version 3 (GPLv3) at this time for any software where a choice of
+GPL license versions is made available with the language indicating that GPLv3
+or any later version may be used, or where a choice of which version of the GPL
 is applied is otherwise unspecified.
 ====================================================================
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, 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 or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-  1. You may copy and distribute verbatim copies of the Program's
-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 give any other recipients of the Program a copy of this License
-along with the Program.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-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.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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.
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
 
-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 Program.
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
 
-    a) 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; or,
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
 
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
 
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
 
-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.
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
 
-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.
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 Program
-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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-			    NO WARRANTY
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
 
-  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+  17. Interpretation of Sections 15 and 16.
 
-	    How to Apply These Terms to Your New Programs
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -295,15 +637,15 @@
 
   To do so, attach the following notices to the program.  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
+state 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 program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -311,37 +653,31 @@
     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; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/usr/src/pkgdefs/SUNWgnu-emacs-x/depend	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-x/depend	Sun Dec 20 07:12:51 2009 +0200
@@ -17,9 +17,9 @@
 #
 # CDDL HEADER END
 #
-#  ident	"@(#)depend	1.1	08/09/16 SMI"
+#  ident	"@(#)depend	1.2	09/10/29 SMI"
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -50,13 +50,22 @@
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
 
-P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWgnu-emacs	GNU emacs core
-P SUNWjpg	jpeg - The Independent JPEG Groups JPEG software
-P SUNWlibms	Math & Microtasking Libraries (Usr)
-P SUNWlibmsr	Math & Microtasking Libraries (Root)
-P SUNWpng	Portable Network Graphics library
-P SUNWTiff	libtiff - library for reading and writing TIFF
-P SUNWxwice	X Window System Inter-Client Exchange (ICE) Components
-P SUNWxwplt	X Window System platform software
-P SUNWxwrtl	X Window System & Graphics Runtime Library Links in /usr/lib
+
+P SUNWcairo     Vector graphics library
+P SUNWcslr      Core Solaris Libraries (Root)
+P SUNWdbus-libs Simple IPC library based on messages - client libraries
+P SUNWfontconfig        Fontconfig library
+P SUNWfreetype2 FreeType2 Font library
+P SUNWglib2     GNOME core libraries
+P SUNWgtk2      GTK+ - GIMP toolkit libraries
+P SUNWjpg       jpeg - The Independent JPEG Groups JPEG software
+P SUNWlibmsr    Math & Microtasking Libraries (Root)
+P SUNWlibrsvg   SVG-format scalable graphics support library
+P SUNWmlib      mediaLib - Shared Libraries
+P SUNWpng       Portable Network Graphics library
+P SUNWTiff      libtiff - library for reading and writing TIFF
+P SUNWxwice     X Window System Inter-Client Exchange (ICE) Components
+P SUNWxwplt     X Window System platform software
+P SUNWxwxft     Xft (X Freetype) Library
+P SUNWzlibr     The Zip compression library (Root)
--- a/usr/src/pkgdefs/SUNWgnu-emacs-x/pkginfo.tmpl	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-x/pkginfo.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)pkginfo.tmpl	1.1	08/09/16 SMI"
+# ident	"@(#)pkginfo.tmpl	1.2	09/10/29 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -37,7 +37,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="GNU emacs binaries with X11 support (Xaw toolkit) (22.1)"
+DESC="GNU emacs binaries with X11 support (Xaw toolkit) (23.1)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWgnu-emacs-x/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-x/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -20,10 +20,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_com	1.1	08/09/16 SMI"
+# ident	"@(#)prototype_com	1.2	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -48,8 +48,9 @@
 
 d none usr 0755 root sys
 d none usr/bin 0755 root bin
-l none usr/bin/emacs-x-22.1=../../usr/lib/isaexec
-l none usr/bin/emacs-x=../../usr/lib/isaexec
+l none usr/bin/emacs-x=../lib/isaexec
+l none usr/bin/emacs-x-23.1=../lib/isaexec
+
 
 d none usr/share 0755 root sys
 d none usr/share/man 0755 root bin
--- a/usr/src/pkgdefs/SUNWgnu-emacs-x/prototype_i386	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-x/prototype_i386	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_i386	1.1	08/09/16 SMI"
+# ident	"@(#)prototype_i386	1.2	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -49,11 +49,12 @@
 # SUNWgnu-emacs-x
 #
 
+
 d none usr/bin/i86 0755 root bin
-f none usr/bin/i86/emacs-x-22.1 0555 root bin
-l none usr/bin/i86/emacs-x=emacs-x-22.1
+f none usr/bin/i86/emacs-x-23.1 0555 root bin
+l none usr/bin/i86/emacs-x=emacs-x-23.1
 
 
 d none usr/bin/amd64 0755 root bin
-f none usr/bin/amd64/emacs-x-22.1 0555 root bin
-l none usr/bin/amd64/emacs-x=emacs-x-22.1
+f none usr/bin/amd64/emacs-x-23.1 0555 root bin
+l none usr/bin/amd64/emacs-x=emacs-x-23.1
--- a/usr/src/pkgdefs/SUNWgnu-emacs-x/prototype_sparc	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-x/prototype_sparc	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_sparc	1.1	08/09/16 SMI"
+# ident	"@(#)prototype_sparc	1.2	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -49,11 +49,12 @@
 # SUNWgnu-emacs-x
 #
 
+
 d none usr/bin/sparcv7 0755 root bin
-f none usr/bin/sparcv7/emacs-x-22.1 0555 root bin
-l none usr/bin/sparcv7/emacs-x=emacs-x-22.1
+f none usr/bin/sparcv7/emacs-x-23.1 0555 root bin
+l none usr/bin/sparcv7/emacs-x=emacs-x-23.1
 
 
 d none usr/bin/sparcv9 0755 root bin
-f none usr/bin/sparcv9/emacs-x-22.1 0555 root bin
-l none usr/bin/sparcv9/emacs-x=emacs-x-22.1
+f none usr/bin/sparcv9/emacs-x-23.1 0555 root bin
+l none usr/bin/sparcv9/emacs-x=emacs-x-23.1
--- a/usr/src/pkgdefs/SUNWgnu-emacs/copyright	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs/copyright	Sun Dec 20 07:12:51 2009 +0200
@@ -1,293 +1,635 @@
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
+For the avoidance of doubt, except that if any license choice other than GPL or
+LGPL is available it will apply instead, Sun elects to use only the General
+Public License version 3 (GPLv3) at this time for any software where a choice of
+GPL license versions is made available with the language indicating that GPLv3
+or any later version may be used, or where a choice of which version of the GPL
 is applied is otherwise unspecified.
 ====================================================================
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, 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 or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-  1. You may copy and distribute verbatim copies of the Program's
-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 give any other recipients of the Program a copy of this License
-along with the Program.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-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.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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.
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
 
-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 Program.
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
 
-    a) 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; or,
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  However, as a
-special exception, the source code 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.
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
 
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
 
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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 to
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
 
-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.
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
 
-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.
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 Program
-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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-			    NO WARRANTY
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
 
-  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+  17. Interpretation of Sections 15 and 16.
 
-	    How to Apply These Terms to Your New Programs
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -295,15 +637,15 @@
 
   To do so, attach the following notices to the program.  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
+state 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 program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -311,37 +653,31 @@
     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; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/usr/src/pkgdefs/SUNWgnu-emacs/depend	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs/depend	Sun Dec 20 07:12:51 2009 +0200
@@ -17,9 +17,9 @@
 #
 # CDDL HEADER END
 #
-#  ident	"@(#)depend	1.1	08/09/16 SMI"
+#  ident	"@(#)depend	1.2	09/10/29 SMI"
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -50,9 +50,6 @@
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
 
-P SUNWcslr	Core Solaris Libraries (Root)
-P SUNWlibms	Math & Microtasking Libraries (Usr)
-P SUNWlibmsr	Math & Microtasking Libraries (Root)
 P SUNWperl584core	Perl 5.8.4 (core)
-P SUNWzlib	The Zip compression library
-P SUNWzlibr	The Zip compression library (Root)
+
+P SUNWcslr      Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWgnu-emacs/pkginfo.tmpl	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs/pkginfo.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)pkginfo.tmpl	1.1	08/09/16 SMI"
+# ident	"@(#)pkginfo.tmpl	1.2	09/10/29 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -37,7 +37,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="GNU emacs core (22.1)"
+DESC="GNU emacs core (23.1)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWgnu-emacs/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#  ident	"@(#)prototype_com	1.2	09/07/24 SMI"
+#  ident	"@(#)prototype_com	1.3	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -62,1680 +62,2245 @@
 f none usr/gnu/bin/etags 0555 root bin
 
 
+d none usr/gnu/share 0755 root sys
+d none usr/gnu/share/man 0755 root bin
+d none usr/gnu/share/man/man1 0755 root bin
+f none usr/gnu/share/man/man1/ctags.1 0444 root bin
+f none usr/gnu/share/man/man1/etags.1 0444 root bin
+
+
 d none usr/share 0755 root sys
+d none usr/share/applications 0755 root other
+f none usr/share/applications/emacs.desktop 0444 root bin
+
+
 d none usr/share/emacs 0755 root bin
-d none usr/share/emacs/22.1 0755 root bin
-d none usr/share/emacs/22.1/etc 0755 root bin
-f none usr/share/emacs/22.1/etc/BABYL 0444 root bin
-f none usr/share/emacs/22.1/etc/CENSORSHIP 0444 root bin
-f none usr/share/emacs/22.1/etc/COOKIES 0444 root bin
-f none usr/share/emacs/22.1/etc/COPYING 0444 root bin
-f none usr/share/emacs/22.1/etc/DEBUG 0444 root bin
-f none usr/share/emacs/22.1/etc/DEVEL.HUMOR 0444 root bin
-f none usr/share/emacs/22.1/etc/DISTRIB 0444 root bin
-f none usr/share/emacs/22.1/etc/DOC-22.1.1 0444 root bin
-f none usr/share/emacs/22.1/etc/ERC-NEWS 0444 root bin
-f none usr/share/emacs/22.1/etc/ETAGS.EBNF 0444 root bin
-f none usr/share/emacs/22.1/etc/ETAGS.README 0444 root bin
-f none usr/share/emacs/22.1/etc/FTP 0444 root bin
-f none usr/share/emacs/22.1/etc/GNU 0444 root bin
-f none usr/share/emacs/22.1/etc/GNUS-NEWS 0444 root bin
-f none usr/share/emacs/22.1/etc/HELLO 0444 root bin
-f none usr/share/emacs/22.1/etc/INTERVIEW 0444 root bin
-f none usr/share/emacs/22.1/etc/JOKES 0444 root bin
-f none usr/share/emacs/22.1/etc/LINUX-GNU 0444 root bin
-f none usr/share/emacs/22.1/etc/MACHINES 0444 root bin
-f none usr/share/emacs/22.1/etc/MAILINGLISTS 0444 root bin
-f none usr/share/emacs/22.1/etc/MH-E-NEWS 0444 root bin
-f none usr/share/emacs/22.1/etc/MORE.STUFF 0444 root bin
-f none usr/share/emacs/22.1/etc/MOTIVATION 0444 root bin
-f none usr/share/emacs/22.1/etc/NEWS 0444 root bin
-f none usr/share/emacs/22.1/etc/NEWS.1-17 0444 root bin
-f none usr/share/emacs/22.1/etc/NEWS.18 0444 root bin
-f none usr/share/emacs/22.1/etc/NEWS.19 0444 root bin
-f none usr/share/emacs/22.1/etc/NEWS.20 0444 root bin
-f none usr/share/emacs/22.1/etc/NEWS.21 0444 root bin
-f none usr/share/emacs/22.1/etc/ORDERS 0444 root bin
-f none usr/share/emacs/22.1/etc/PROBLEMS 0444 root bin
-f none usr/share/emacs/22.1/etc/README 0444 root bin
-f none usr/share/emacs/22.1/etc/SERVICE 0444 root bin
-f none usr/share/emacs/22.1/etc/TERMS 0444 root bin
-f none usr/share/emacs/22.1/etc/THE-GNU-PROJECT 0444 root bin
-f none usr/share/emacs/22.1/etc/TODO 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.bg 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.cn 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.cs 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.de 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.eo 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.es 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.fr 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.it 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.ja 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.ko 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.nl 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.pl 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.pt_BR 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.ro 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.ru 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.sk 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.sl 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.sv 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.th 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.translators 0444 root bin
-f none usr/share/emacs/22.1/etc/TUTORIAL.zh 0444 root bin
-f none usr/share/emacs/22.1/etc/WHY-FREE 0444 root bin
-f none usr/share/emacs/22.1/etc/calccard.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/calccard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/celibacy.1 0444 root bin
-f none usr/share/emacs/22.1/etc/compilation.txt 0444 root bin
-f none usr/share/emacs/22.1/etc/condom.1 0444 root bin
-f none usr/share/emacs/22.1/etc/copying.paper 0444 root bin
-f none usr/share/emacs/22.1/etc/cs-dired-ref.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/cs-dired-ref.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/cs-refcard.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/cs-refcard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/cs-survival.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/ctags.1 0444 root bin
-f none usr/share/emacs/22.1/etc/de-refcard.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/de-refcard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/dired-ref.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/dired-ref.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/echo.msg 0444 root bin
-f none usr/share/emacs/22.1/etc/edt-user.doc 0444 root bin
-f none usr/share/emacs/22.1/etc/emacs-buffer.gdb 0444 root bin
-f none usr/share/emacs/22.1/etc/emacs.1 0444 root bin
-f none usr/share/emacs/22.1/etc/emacs.bash 0444 root bin
-f none usr/share/emacs/22.1/etc/emacs.csh 0444 root bin
-f none usr/share/emacs/22.1/etc/emacs.icon 0444 root bin
-f none usr/share/emacs/22.1/etc/emacs.py 0444 root bin
-f none usr/share/emacs/22.1/etc/emacsclient.1 0444 root bin
-f none usr/share/emacs/22.1/etc/emacstool.1 0444 root bin
-f none usr/share/emacs/22.1/etc/enriched.doc 0444 root bin
-f none usr/share/emacs/22.1/etc/etags.1 0444 root bin
-f none usr/share/emacs/22.1/etc/fr-drdref.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/fr-drdref.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/fr-refcard.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/fr-refcard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/fr-survival.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/future-bug 0444 root bin
-f none usr/share/emacs/22.1/etc/gnus-booklet.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/gnus-logo.eps 0444 root bin
-f none usr/share/emacs/22.1/etc/gnus-refcard.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/gnus-refcard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/gnus-tut.txt 0444 root bin
-f none usr/share/emacs/22.1/etc/gnus.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/grep.txt 0444 root bin
-f none usr/share/emacs/22.1/etc/letter.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/letter.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/ms-kermit 0444 root bin
-f none usr/share/emacs/22.1/etc/orgcard.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/orgcard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/pl-refcard.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/pl-refcard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/ps-prin0.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/ps-prin1.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/pt-br-refcard.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/pt-br-refcard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/refcard.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/refcard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/rgb.txt 0444 root bin
-f none usr/share/emacs/22.1/etc/ru-refcard.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/ru-refcard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/ses-example.ses 0444 root bin
-f none usr/share/emacs/22.1/etc/sex.6 0444 root bin
-f none usr/share/emacs/22.1/etc/sk-dired-ref.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/sk-dired-ref.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/sk-refcard.ps 0444 root bin
-f none usr/share/emacs/22.1/etc/sk-refcard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/sk-survival.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/splash.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/splash.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/splash8.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/spook.lines 0444 root bin
-f none usr/share/emacs/22.1/etc/survival.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/termcap.src 0444 root bin
-f none usr/share/emacs/22.1/etc/vipcard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/viperCard.tex 0444 root bin
-f none usr/share/emacs/22.1/etc/yow.lines 0444 root bin
+d none usr/share/emacs/23.1 0755 root bin
+d none usr/share/emacs/23.1/etc 0755 root bin
+f none usr/share/emacs/23.1/etc/AUTHORS 0444 root bin
+f none usr/share/emacs/23.1/etc/BABYL 0444 root bin
+f none usr/share/emacs/23.1/etc/CENSORSHIP 0444 root bin
+f none usr/share/emacs/23.1/etc/CONTRIBUTE 0444 root bin
+f none usr/share/emacs/23.1/etc/COOKIES 0444 root bin
+f none usr/share/emacs/23.1/etc/COPYING 0444 root bin
+f none usr/share/emacs/23.1/etc/DEBUG 0444 root bin
+f none usr/share/emacs/23.1/etc/DEVEL.HUMOR 0444 root bin
+f none usr/share/emacs/23.1/etc/DISTRIB 0444 root bin
+f none usr/share/emacs/23.1/etc/DOC-23.1.1 0444 root bin
+f none usr/share/emacs/23.1/etc/ERC-NEWS 0444 root bin
+f none usr/share/emacs/23.1/etc/ETAGS.EBNF 0444 root bin
+f none usr/share/emacs/23.1/etc/ETAGS.README 0444 root bin
+f none usr/share/emacs/23.1/etc/FTP 0444 root bin
+f none usr/share/emacs/23.1/etc/GNU 0444 root bin
+f none usr/share/emacs/23.1/etc/GNUS-NEWS 0444 root bin
+f none usr/share/emacs/23.1/etc/HELLO 0444 root bin
+f none usr/share/emacs/23.1/etc/INTERVIEW 0444 root bin
+f none usr/share/emacs/23.1/etc/JOKES 0444 root bin
+f none usr/share/emacs/23.1/etc/LINUX-GNU 0444 root bin
+f none usr/share/emacs/23.1/etc/MACHINES 0444 root bin
+f none usr/share/emacs/23.1/etc/MAILINGLISTS 0444 root bin
+f none usr/share/emacs/23.1/etc/MH-E-NEWS 0444 root bin
+f none usr/share/emacs/23.1/etc/MORE.STUFF 0444 root bin
+f none usr/share/emacs/23.1/etc/MOTIVATION 0444 root bin
+f none usr/share/emacs/23.1/etc/NEWS 0444 root bin
+f none usr/share/emacs/23.1/etc/NEWS.1-17 0444 root bin
+f none usr/share/emacs/23.1/etc/NEWS.18 0444 root bin
+f none usr/share/emacs/23.1/etc/NEWS.19 0444 root bin
+f none usr/share/emacs/23.1/etc/NEWS.20 0444 root bin
+f none usr/share/emacs/23.1/etc/NEWS.21 0444 root bin
+f none usr/share/emacs/23.1/etc/NEWS.22 0444 root bin
+f none usr/share/emacs/23.1/etc/NXML-NEWS 0444 root bin
+f none usr/share/emacs/23.1/etc/ORDERS 0444 root bin
+f none usr/share/emacs/23.1/etc/PROBLEMS 0444 root bin
+f none usr/share/emacs/23.1/etc/README 0444 root bin
+f none usr/share/emacs/23.1/etc/SERVICE 0444 root bin
+f none usr/share/emacs/23.1/etc/TERMS 0444 root bin
+f none usr/share/emacs/23.1/etc/THE-GNU-PROJECT 0444 root bin
+f none usr/share/emacs/23.1/etc/TODO 0444 root bin
+f none usr/share/emacs/23.1/etc/WHY-FREE 0444 root bin
+f none usr/share/emacs/23.1/etc/celibacy.1 0444 root bin
+f none usr/share/emacs/23.1/etc/compilation.txt 0444 root bin
+f none usr/share/emacs/23.1/etc/condom.1 0444 root bin
+f none usr/share/emacs/23.1/etc/copying.paper 0444 root bin
+f none usr/share/emacs/23.1/etc/echo.msg 0444 root bin
+f none usr/share/emacs/23.1/etc/edt-user.doc 0444 root bin
+f none usr/share/emacs/23.1/etc/emacs-buffer.gdb 0444 root bin
+f none usr/share/emacs/23.1/etc/emacs.bash 0444 root bin
+f none usr/share/emacs/23.1/etc/emacs.csh 0444 root bin
+f none usr/share/emacs/23.1/etc/emacs.desktop 0444 root bin
+f none usr/share/emacs/23.1/etc/emacs.icon 0444 root bin
+f none usr/share/emacs/23.1/etc/emacs.py 0444 root bin
+f none usr/share/emacs/23.1/etc/emacs2.py 0444 root bin
+f none usr/share/emacs/23.1/etc/emacs3.py 0444 root bin
+f none usr/share/emacs/23.1/etc/enriched.doc 0444 root bin
+f none usr/share/emacs/23.1/etc/forms-d2.dat 0444 root bin
+f none usr/share/emacs/23.1/etc/future-bug 0444 root bin
+f none usr/share/emacs/23.1/etc/gnus-tut.txt 0444 root bin
+f none usr/share/emacs/23.1/etc/grep.txt 0444 root bin
+f none usr/share/emacs/23.1/etc/ms-kermit 0444 root bin
+f none usr/share/emacs/23.1/etc/ps-prin0.ps 0444 root bin
+f none usr/share/emacs/23.1/etc/ps-prin1.ps 0444 root bin
+f none usr/share/emacs/23.1/etc/rgb.txt 0444 root bin
+f none usr/share/emacs/23.1/etc/ses-example.ses 0444 root bin
+f none usr/share/emacs/23.1/etc/sex.6 0444 root bin
+f none usr/share/emacs/23.1/etc/spook.lines 0444 root bin
+f none usr/share/emacs/23.1/etc/yow.lines 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/charsets 0755 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-10.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-11.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-13.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-14.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-15.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-16.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-2.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-3.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-4.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-5.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-6.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-7.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-8.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/8859-9.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/ALTERNATIVNYJ.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/BIG5-1.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/BIG5-2.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/BIG5-HKSCS.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/BIG5.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CNS-1.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CNS-2.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CNS-3.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CNS-4.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CNS-5.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CNS-6.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CNS-7.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CNS-F.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP10007.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP1125.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP1250.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP1251.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP1252.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP1253.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP1254.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP1255.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP1256.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP1257.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP1258.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP720.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP737.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP775.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP858.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP932-2BYTE.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/CP949-2BYTE.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/EBCDICUK.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/EBCDICUS.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/GB180302.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/GB180304.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/GB2312.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/GBK.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/HP-ROMAN8.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM037.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM038.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM1004.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM1026.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM1047.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM256.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM273.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM274.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM275.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM277.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM278.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM280.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM281.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM284.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM285.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM290.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM297.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM420.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM423.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM424.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM437.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM500.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM850.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM851.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM852.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM855.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM856.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM857.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM860.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM861.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM862.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM863.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM864.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM865.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM866.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM868.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM869.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM870.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM871.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM874.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM875.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM880.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM891.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM903.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM904.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM905.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/IBM918.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/JISC6226.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/JISX0201.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/JISX0208.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/JISX0212.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/JISX2131.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/JISX2132.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/JISX213A.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/JOHAB.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/KA-ACADEMY.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/KA-PS.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/KOI-8.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/KOI8-R.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/KOI8-T.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/KOI8-U.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/KSC5601.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/KSC5636.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/MACINTOSH.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/MIK.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/MULE-ethiopic.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/MULE-ipa.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/MULE-is13194.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/MULE-lviscii.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/MULE-sisheng.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/MULE-tibetan.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/MULE-uviscii.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/NEXTSTEP.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/PTCP154.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/README 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/TIS-620.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/VISCII.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/VSCII-2.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/VSCII.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/stdenc.map 0444 root bin
+f none usr/share/emacs/23.1/etc/charsets/symbol.map 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/e 0755 root bin
+f none usr/share/emacs/23.1/etc/e/README 0444 root bin
+f none usr/share/emacs/23.1/etc/e/eterm-color 0444 root bin
+f none usr/share/emacs/23.1/etc/e/eterm-color.ti 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/gnus 0755 root bin
+f none usr/share/emacs/23.1/etc/gnus/gnus-setup.ast 0444 root bin
+f none usr/share/emacs/23.1/etc/gnus/news-server.ast 0444 root bin
 
 
-d none usr/share/emacs/22.1/etc/e 0755 root bin
-f none usr/share/emacs/22.1/etc/e/eterm-color 0444 root bin
-f none usr/share/emacs/22.1/etc/e/eterm-color.ti 0444 root bin
+d none usr/share/emacs/23.1/etc/images 0755 root bin
+f none usr/share/emacs/23.1/etc/images/README 0444 root bin
+f none usr/share/emacs/23.1/etc/images/attach.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/attach.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/back-arrow.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/back-arrow.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/bookmark_add.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/bookmark_add.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/cancel.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/cancel.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/close.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/close.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/connect.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/contact.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/contact.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/copy.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/copy.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/cut.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/cut.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/data-save.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/data-save.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/delete.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/delete.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/describe.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/diropen.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/diropen.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/disconnect.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/exit.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/exit.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/fwd-arrow.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/fwd-arrow.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/help.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/help.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/home.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/home.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/index.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/index.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/info.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/info.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/jump-to.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/jump-to.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/left-arrow.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/left-arrow.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/letter.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/letter.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/lock-broken.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/lock-ok.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/lock.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mh-logo.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/new.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/new.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/next-node.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/next-node.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/next-page.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/next-page.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/open.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/open.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/paste.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/paste.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/preferences.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/preferences.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/prev-node.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/prev-node.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/print.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/print.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/redo.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/refresh.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/refresh.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/right-arrow.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/right-arrow.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/save.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/save.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/saveas.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/saveas.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/search-replace.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/search-replace.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/search.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/search.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/separator.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/show.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/show.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/sort-ascending.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/sort-column-ascending.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/sort-criteria.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/sort-descending.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/sort-row-ascending.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/spell.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/spell.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/splash.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/splash.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/splash.svg 0444 root bin
+f none usr/share/emacs/23.1/etc/images/splash.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/undo.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/undo.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/up-arrow.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/up-arrow.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/up-node.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/up-node.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/zoom-in.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/zoom-out.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/zoom-out.xpm 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/custom 0755 root bin
+f none usr/share/emacs/23.1/etc/images/custom/README 0444 root bin
+f none usr/share/emacs/23.1/etc/images/custom/down-pushed.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/custom/down.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/custom/right-pushed.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/custom/right.xpm 0444 root bin
 
 
-d none usr/share/emacs/22.1/etc/images 0755 root bin
-f none usr/share/emacs/22.1/etc/images/README 0444 root bin
-f none usr/share/emacs/22.1/etc/images/attach.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/attach.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/back-arrow.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/back-arrow.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/cancel.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/cancel.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/close.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/close.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/connect.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/contact.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/contact.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/copy.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/copy.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/cut.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/cut.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/data-save.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/data-save.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/delete.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/delete.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/describe.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/diropen.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/diropen.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/disconnect.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/exit.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/exit.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/fwd-arrow.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/fwd-arrow.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/help.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/help.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/home.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/home.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/index.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/index.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/info.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/info.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/jump-to.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/jump-to.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/left-arrow.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/left-arrow.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/lock-broken.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/lock-ok.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/lock.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mh-logo.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/new.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/new.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/next-node.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/next-node.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/next-page.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/next-page.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/open.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/open.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/paste.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/paste.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/preferences.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/preferences.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/prev-node.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/prev-node.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/print.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/print.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/redo.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/refresh.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/refresh.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/right-arrow.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/right-arrow.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/save.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/save.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/saveas.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/saveas.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/search-replace.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/search-replace.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/search.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/search.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/separator.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/show.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/show.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/sort-ascending.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/sort-column-ascending.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/sort-criteria.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/sort-descending.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/sort-row-ascending.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/spell.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/spell.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/undo.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/undo.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/up-arrow.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/up-arrow.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/up-node.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/up-node.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/zoom-in.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/zoom-out.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/zoom-out.xpm 0444 root bin
+d none usr/share/emacs/23.1/etc/images/ezimage 0755 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/README 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/bits.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/bitsbang.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/box-minus.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/box-plus.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/box.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/checkmark.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/dir-minus.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/dir-plus.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/dir.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/doc-minus.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/doc-plus.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/doc.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/info.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/key.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/label.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/lock.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/mail.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/page-minus.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/page-plus.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/page.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/tag-gt.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/tag-minus.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/tag-plus.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/tag-type.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/tag-v.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/tag.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/ezimage/unlock.xpm 0444 root bin
 
 
-d none usr/share/emacs/22.1/etc/images/ezimage 0755 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/README 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/bits.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/bitsbang.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/box-minus.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/box-plus.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/box.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/checkmark.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/dir-minus.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/dir-plus.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/dir.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/doc-minus.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/doc-plus.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/doc.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/info.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/key.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/label.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/lock.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/mail.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/page-minus.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/page-plus.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/page.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/tag-gt.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/tag-minus.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/tag-plus.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/tag-type.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/tag-v.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/tag.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/ezimage/unlock.xpm 0444 root bin
+d none usr/share/emacs/23.1/etc/images/gnus 0755 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/README 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/catchup.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/catchup.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/cu-exit.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/cu-exit.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/describe-group.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/describe-group.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/exit-gnus.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/exit-gnus.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/exit-summ.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/exit-summ.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/followup.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/followup.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/fuwo.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/fuwo.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/get-news.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/get-news.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/gnntg.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/gnntg.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/gnus-pointer.xbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/gnus-pointer.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/gnus.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/gnus.svg 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/gnus.xbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/gnus.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/important.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/kill-group.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/kill-group.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/mail-reply.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/mail-reply.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/mail-send.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/next-ur.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/next-ur.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/post.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/post.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/prev-ur.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/prev-ur.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/preview.xbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/preview.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/receipt.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/reply-wo.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/reply-wo.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/reply.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/reply.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/rot13.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/rot13.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/save-aif.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/save-aif.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/save-art.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/save-art.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/subscribe.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/subscribe.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/toggle-subscription.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/unimportant.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/unsubscribe.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/unsubscribe.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/uu-decode.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/uu-decode.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/uu-post.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gnus/uu-post.xpm 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/gud 0755 root bin
+f none usr/share/emacs/23.1/etc/images/gud/README 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/break.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/break.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/cont.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/cont.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/down.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/down.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/finish.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/finish.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/go.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/go.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/next.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/next.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/nexti.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/nexti.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/pp.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/pp.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/print.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/print.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/pstar.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/pstar.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/remove.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/remove.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/run.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/run.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/step.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/step.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/stepi.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/stepi.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/stop.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/stop.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/until.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/until.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/up.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/up.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/watch.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/gud/watch.xpm 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/icons 0755 root bin
+f none usr/share/emacs/23.1/etc/images/icons/README 0444 root bin
 
 
-d none usr/share/emacs/22.1/etc/images/gnus 0755 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/README 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/catchup.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/catchup.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/cu-exit.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/cu-exit.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/describe-group.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/describe-group.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/exit-gnus.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/exit-gnus.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/exit-summ.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/exit-summ.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/followup.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/followup.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/fuwo.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/fuwo.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/get-news.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/get-news.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/gnntg.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/gnntg.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/gnus-pointer.xbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/gnus-pointer.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/gnus.xbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/gnus.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/important.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/kill-group.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/kill-group.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/mail-reply.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/mail-reply.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/next-ur.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/next-ur.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/post.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/post.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/prev-ur.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/prev-ur.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/preview.xbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/preview.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/receipt.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/reply-wo.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/reply-wo.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/reply.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/reply.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/rot13.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/rot13.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/save-aif.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/save-aif.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/save-art.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/save-art.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/subscribe.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/subscribe.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/toggle-subscription.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/unimportant.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/unsubscribe.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/unsubscribe.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/uu-decode.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/uu-decode.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/uu-post.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gnus/uu-post.xpm 0444 root bin
+d none usr/share/emacs/23.1/etc/images/icons/hicolor 0755 root bin
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/128x128 0755 root bin
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/128x128/apps 0755 root bin
+f none usr/share/emacs/23.1/etc/images/icons/hicolor/128x128/apps/emacs.png 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/16x16 0755 root bin
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/16x16/apps 0755 root bin
+f none usr/share/emacs/23.1/etc/images/icons/hicolor/16x16/apps/emacs.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/icons/hicolor/16x16/apps/emacs22.png 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/24x24 0755 root bin
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/24x24/apps 0755 root bin
+f none usr/share/emacs/23.1/etc/images/icons/hicolor/24x24/apps/emacs.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/icons/hicolor/24x24/apps/emacs22.png 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/32x32 0755 root bin
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/32x32/apps 0755 root bin
+f none usr/share/emacs/23.1/etc/images/icons/hicolor/32x32/apps/emacs.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/icons/hicolor/32x32/apps/emacs22.png 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/48x48 0755 root bin
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/48x48/apps 0755 root bin
+f none usr/share/emacs/23.1/etc/images/icons/hicolor/48x48/apps/emacs.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/icons/hicolor/48x48/apps/emacs22.png 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/scalable 0755 root bin
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/scalable/apps 0755 root bin
+f none usr/share/emacs/23.1/etc/images/icons/hicolor/scalable/apps/emacs.svg 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/icons/hicolor/scalable/mimetypes 0755 root bin
+f none usr/share/emacs/23.1/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/low-color 0755 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/README 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/back-arrow.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/copy.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/cut.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/fwd-arrow.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/help.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/home.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/index.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/jump-to.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/left-arrow.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/new.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/next-node.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/open.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/paste.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/preferences.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/prev-node.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/print.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/right-arrow.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/save.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/saveas.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/search.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/spell.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/undo.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/up-arrow.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/low-color/up-node.xpm 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/mail 0755 root bin
+f none usr/share/emacs/23.1/etc/images/mail/README 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/compose.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/compose.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/copy.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/flag-for-followup.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/flag-for-followup.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/forward.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/inbox.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/inbox.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/move.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/move.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/not-spam.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/outbox.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/preview.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/repack.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/repack.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/reply-all.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/reply-all.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/reply-from.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/reply-from.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/reply-to.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/reply-to.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/reply.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/reply.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/save-draft.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/save.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/send.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/send.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/mail/spam.xpm 0444 root bin
 
 
-d none usr/share/emacs/22.1/etc/images/gud 0755 root bin
-f none usr/share/emacs/22.1/etc/images/gud/README 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/break.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/break.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/cont.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/cont.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/down.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/down.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/finish.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/finish.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/go.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/go.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/next.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/next.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/nexti.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/nexti.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/pp.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/pp.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/print.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/print.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/pstar.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/pstar.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/remove.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/remove.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/run.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/run.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/step.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/step.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/stepi.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/stepi.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/stop.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/stop.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/until.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/until.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/up.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/up.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/watch.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/gud/watch.xpm 0444 root bin
+d none usr/share/emacs/23.1/etc/images/smilies 0755 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/README 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/blink.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/blink.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/braindamaged.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/cry.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/dead.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/evil.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/forced.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/frown.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/frown.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grin.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/indifferent.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/sad.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/sad.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/smile.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/smile.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/wry.pbm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/wry.xpm 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/smilies/grayscale 0755 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/README 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/blink.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/braindamaged.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/cry.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/dead.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/evil.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/forced.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/frown.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/grin.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/indifferent.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/reverse-smile.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/sad.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/smile.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/grayscale/wry.xpm 0444 root bin
 
 
-d none usr/share/emacs/22.1/etc/images/icons 0755 root bin
-f none usr/share/emacs/22.1/etc/images/icons/README 0444 root bin
-f none usr/share/emacs/22.1/etc/images/icons/emacs_16.png 0444 root bin
-f none usr/share/emacs/22.1/etc/images/icons/emacs_24.png 0444 root bin
-f none usr/share/emacs/22.1/etc/images/icons/emacs_32.png 0444 root bin
-f none usr/share/emacs/22.1/etc/images/icons/emacs_48.png 0444 root bin
+d none usr/share/emacs/23.1/etc/images/smilies/medium 0755 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/README 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/blink.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/braindamaged.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/cry.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/dead.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/evil.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/forced.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/frown.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/grin.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/indifferent.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/reverse-smile.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/sad.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/smile.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/smilies/medium/wry.xpm 0444 root bin
 
 
-d none usr/share/emacs/22.1/etc/images/low-color 0755 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/README 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/back-arrow.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/copy.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/cut.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/fwd-arrow.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/help.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/home.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/index.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/jump-to.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/left-arrow.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/new.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/next-node.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/open.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/paste.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/preferences.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/prev-node.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/print.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/right-arrow.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/save.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/saveas.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/search.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/spell.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/undo.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/up-arrow.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/low-color/up-node.xpm 0444 root bin
+d none usr/share/emacs/23.1/etc/images/tree-widget 0755 root bin
+d none usr/share/emacs/23.1/etc/images/tree-widget/default 0755 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/README 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/close.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/close.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/empty.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/empty.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/end-guide.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/end-guide.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/guide.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/guide.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/handle.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/handle.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/leaf.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/leaf.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/no-guide.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/no-guide.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/no-handle.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/no-handle.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/open.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/default/open.xpm 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/images/tree-widget/folder 0755 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/README 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/close.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/close.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/empty.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/empty.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/end-guide.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/end-guide.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/guide.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/guide.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/handle.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/handle.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/leaf.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/leaf.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/no-guide.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/no-guide.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/no-handle.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/no-handle.xpm 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/open.png 0444 root bin
+f none usr/share/emacs/23.1/etc/images/tree-widget/folder/open.xpm 0444 root bin
 
 
-d none usr/share/emacs/22.1/etc/images/mail 0755 root bin
-f none usr/share/emacs/22.1/etc/images/mail/README 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/compose.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/compose.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/copy.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/flag-for-followup.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/flag-for-followup.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/forward.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/inbox.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/inbox.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/move.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/move.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/not-spam.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/outbox.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/preview.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/repack.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/repack.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/reply-all.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/reply-all.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/reply-from.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/reply-from.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/reply-to.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/reply-to.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/reply.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/reply.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/save-draft.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/save.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/send.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/send.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/mail/spam.xpm 0444 root bin
-
-
-d none usr/share/emacs/22.1/etc/images/smilies 0755 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/README 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/blink.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/blink.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/braindamaged.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/cry.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/dead.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/evil.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/forced.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/frown.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/frown.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/grin.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/indifferent.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/sad.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/sad.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/smile.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/smile.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/wry.pbm 0444 root bin
-f none usr/share/emacs/22.1/etc/images/smilies/wry.xpm 0444 root bin
-
-
-d none usr/share/emacs/22.1/etc/tree-widget 0755 root bin
-d none usr/share/emacs/22.1/etc/tree-widget/default 0755 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/README 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/close.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/close.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/empty.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/empty.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/end-guide.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/end-guide.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/guide.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/guide.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/handle.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/handle.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/leaf.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/leaf.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/no-guide.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/no-guide.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/no-handle.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/no-handle.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/open.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/default/open.xpm 0444 root bin
+d none usr/share/emacs/23.1/etc/nxml 0755 root bin
+f none usr/share/emacs/23.1/etc/nxml/00000-0007F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00080-000FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00100-0017F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00180-0024F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00250-002AF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/002B0-002FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00300-0036F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00370-003FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00400-004FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00500-0052F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00530-0058F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00590-005FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00600-006FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00700-0074F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00780-007BF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00900-0097F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00980-009FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00A00-00A7F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00A80-00AFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00B00-00B7F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00B80-00BFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00C00-00C7F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00C80-00CFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00D00-00D7F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00D80-00DFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00E00-00E7F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00E80-00EFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/00F00-00FFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01000-0109F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/010A0-010FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01100-011FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01200-0137F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/013A0-013FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01400-0167F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01680-0169F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/016A0-016FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01700-0171F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01720-0173F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01740-0175F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01760-0177F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01780-017FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01800-018AF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01E00-01EFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/01F00-01FFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02000-0206F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02070-0209F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/020A0-020CF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/020D0-020FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02100-0214F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02150-0218F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02190-021FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02200-022FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02300-023FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02400-0243F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02440-0245F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02460-024FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02500-0257F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02580-0259F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/025A0-025FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02600-026FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02700-027BF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/027C0-027EF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/027F0-027FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02800-028FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02900-0297F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02980-029FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02A00-02AFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02E80-02EFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02F00-02FDF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/02FF0-02FFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/03000-0303F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/03040-0309F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/030A0-030FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/03100-0312F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/03130-0318F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/03190-0319F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/031A0-031BF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/031F0-031FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/03200-032FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/03300-033FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/03400-04DBF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/0A000-0A48F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/0A490-0A4CF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/0FB00-0FB4F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/0FB50-0FDFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/0FE00-0FE0F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/0FE20-0FE2F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/0FE30-0FE4F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/0FE50-0FE6F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/0FE70-0FEFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/0FF00-0FFEF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/0FFF0-0FFFF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/10300-1032F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/10330-1034F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/10400-1044F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/1D000-1D0FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/1D100-1D1FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/1D400-1D7FF.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/E0000-E007F.el 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/README 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/test-invalid.xml 0444 root bin
+f none usr/share/emacs/23.1/etc/nxml/test-valid.xml 0444 root bin
 
 
-d none usr/share/emacs/22.1/etc/tree-widget/folder 0755 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/README 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/close.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/close.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/empty.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/empty.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/end-guide.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/end-guide.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/guide.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/guide.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/handle.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/handle.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/leaf.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/leaf.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/no-guide.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/no-guide.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/no-handle.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/no-handle.xpm 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/open.png 0444 root bin
-f none usr/share/emacs/22.1/etc/tree-widget/folder/open.xpm 0444 root bin
-
-
-d none usr/share/emacs/22.1/leim 0755 root bin
-f none usr/share/emacs/22.1/leim/leim-list.el 0444 root bin
-
-
-d none usr/share/emacs/22.1/leim/ja-dic 0755 root bin
-f none usr/share/emacs/22.1/leim/ja-dic/ja-dic.elc 0444 root bin
+d none usr/share/emacs/23.1/etc/refcards 0755 root bin
+f none usr/share/emacs/23.1/etc/refcards/Makefile 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/README 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/calccard.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/calccard.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/cs-dired-ref.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/cs-dired-ref.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/cs-refcard.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/cs-refcard.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/cs-survival.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/de-refcard.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/de-refcard.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/dired-ref.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/dired-ref.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/fr-dired-ref.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/fr-dired-ref.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/fr-refcard.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/fr-refcard.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/fr-survival.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/gnus-booklet.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/gnus-logo.eps 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/gnus-logo.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/gnus-refcard.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/gnus-refcard.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/orgcard.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/orgcard.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/pdflayout.sty 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/pl-refcard.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/pl-refcard.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/pt-br-refcard.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/pt-br-refcard.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/refcard.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/refcard.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/ru-refcard.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/ru-refcard.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/sk-dired-ref.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/sk-dired-ref.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/sk-refcard.pdf 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/sk-refcard.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/sk-survival.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/survival.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/vipcard.tex 0444 root bin
+f none usr/share/emacs/23.1/etc/refcards/viperCard.tex 0444 root bin
 
 
-d none usr/share/emacs/22.1/leim/quail 0755 root bin
-f none usr/share/emacs/22.1/leim/quail/4Corner.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ARRAY30.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/CCDOSPY.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/CTLau-b5.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/CTLau.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ECDICT.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ETZY.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/PY-b5.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/PY.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/Punct-b5.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/Punct.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/QJ-b5.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/QJ.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/SW.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/TONEPY.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ZIRANMA.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ZOZY.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/croatian.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/cyril-jis.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/cyrillic.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/czech.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ethiopic.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/georgian.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/greek.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/hangul.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/hangul3.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/hanja-jis.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/hanja.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/hanja3.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/hebrew.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/indian.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/ipa.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/japanese.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/lao.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/latin-alt.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/latin-ltx.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/latin-post.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/latin-pre.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/lrt.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/py-punct.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/pypunct-b5.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/quick-b5.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/quick-cns.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/rfc1345.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/sgml-input.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/sisheng.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/slovak.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/symbol-ksc.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/thai.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/tibetan.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/tsang-b5.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/tsang-cns.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/uni-input.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/viqr.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/vntelex.elc 0444 root bin
-f none usr/share/emacs/22.1/leim/quail/welsh.elc 0444 root bin
+d none usr/share/emacs/23.1/etc/schema 0755 root bin
+f none usr/share/emacs/23.1/etc/schema/README 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/calstbl.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/dbcalstbl.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/dbhier.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/dbnotn.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/dbpool.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/dbstart.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/docbook.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/locate.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/rdfxml.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/relaxng.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/schemas.xml 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-applet.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-attribs.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-base.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-bdo.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-bform.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-btable.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-csismap.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-datatypes.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-edit.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-events.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-form.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-frames.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-hypertext.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-iframe.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-image.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-inlstyle.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-legacy.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-link.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-lst.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-meta.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-nameident.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-object.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-param.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-pres.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-ruby.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-script.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-ssismap.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-struct.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-table.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-text.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-tgt.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml-xstyle.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xhtml.rnc 0444 root bin
+f none usr/share/emacs/23.1/etc/schema/xslt.rnc 0444 root bin
+
+
+d none usr/share/emacs/23.1/etc/tutorials 0755 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.bg 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.cn 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.cs 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.de 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.eo 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.es 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.fr 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.it 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.ja 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.ko 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.nl 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.pl 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.pt_BR 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.ro 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.ru 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.sk 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.sl 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.sv 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.th 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.translators 0444 root bin
+f none usr/share/emacs/23.1/etc/tutorials/TUTORIAL.zh 0444 root bin
+
+
+d none usr/share/emacs/23.1/leim 0755 root bin
+f none usr/share/emacs/23.1/leim/leim-list.el 0444 root bin
+
+
+d none usr/share/emacs/23.1/leim/ja-dic 0755 root bin
+f none usr/share/emacs/23.1/leim/ja-dic/ja-dic.elc 0444 root bin
+
+
+d none usr/share/emacs/23.1/leim/quail 0755 root bin
+f none usr/share/emacs/23.1/leim/quail/4Corner.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ARRAY30.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/CCDOSPY.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/CTLau-b5.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/CTLau.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ECDICT.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ETZY.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/PY-b5.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/PY.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/Punct-b5.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/Punct.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/QJ-b5.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/QJ.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/SW.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/TONEPY.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ZIRANMA.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ZOZY.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/arabic.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/croatian.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/cyril-jis.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/cyrillic.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/czech.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ethiopic.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/georgian.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/greek.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/hangul.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/hanja-jis.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/hanja.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/hanja3.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/hebrew.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/indian.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/ipa.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/japanese.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/lao.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/latin-alt.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/latin-ltx.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/latin-post.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/latin-pre.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/lrt.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/py-punct.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/pypunct-b5.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/quick-b5.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/quick-cns.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/rfc1345.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/sgml-input.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/sisheng.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/slovak.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/symbol-ksc.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/thai.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/tibetan.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/tsang-b5.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/tsang-cns.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/uni-input.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/viqr.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/vntelex.elc 0444 root bin
+f none usr/share/emacs/23.1/leim/quail/welsh.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp 0755 root bin
-f none usr/share/emacs/22.1/lisp/COPYING 0444 root bin
-f none usr/share/emacs/22.1/lisp/README 0444 root bin
-f none usr/share/emacs/22.1/lisp/abbrev.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/abbrevlist.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/add-log.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/align.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/allout.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ansi-color.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/apropos.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/arc-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/array.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/autoarg.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/autoinsert.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/autorevert.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/avoid.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/battery.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/bindings.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/bookmark.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/bs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/buff-menu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/button.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calculator.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/case-table.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/cdl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/chistory.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/cmuscheme.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/comint.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/compare-w.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/complete.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/completion.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/composite.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/cus-dep.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/cus-edit.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/cus-face.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/cus-load.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/cus-start.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/cus-theme.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/custom.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/cvs-status.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/dabbrev.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/delim-col.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/delsel.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/descr-text.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/desktop.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/dframe.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/diff-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/diff.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/dired-aux.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/dired-x.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/dired.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/dirtrack.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/disp-table.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/dnd.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/dos-fns.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/dos-vars.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/dos-w32.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/double.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ebuff-menu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/echistory.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-diff.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-help.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-hook.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-init.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-merg.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-mult.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-ptch.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-vers.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff-wind.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ediff.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/edmacro.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ehelp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/electric.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/elide-head.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lock.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emerge.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/env.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/expand.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ezimage.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/facemenu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/faces.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ffap.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/filecache.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/files.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/filesets.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/find-dired.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/find-file.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/find-lisp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/finder-inf.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/finder.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/flow-ctrl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/foldout.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/follow.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/font-core.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/font-lock.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/format.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/forms-d2.dat 0444 root bin
-f none usr/share/emacs/22.1/lisp/forms-d2.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/forms-pass.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/forms.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/frame.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/fringe.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/generic-x.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/help-at-pt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/help-fns.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/help-macro.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/help-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/help.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/hexl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/hi-lock.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/hilit-chg.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/hippie-exp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/hl-line.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ibuf-ext.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ibuf-macs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ibuffer.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/icomplete.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ido.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ielm.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/iimage.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/image-dired.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/image-file.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/image-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/image.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/imenu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/indent.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/info-look.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/info-xref.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/info.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/informat.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/isearch.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/isearchb.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/iswitchb.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/jit-lock.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/jka-cmpr-hook.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/jka-compr.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/kermit.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/kmacro.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ldefs-boot.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/ledit.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/loaddefs.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/loadhist.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/loadup.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/locate.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/log-edit.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/log-view.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/longlines.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/lpr.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ls-lisp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/macros.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/makesum.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/man.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/master.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/menu-bar.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/midnight.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/minibuf-eldef.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/misc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mouse-copy.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mouse-drag.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mouse-sel.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mouse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/msb.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mwheel.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/newcomment.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/novice.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/outline.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/paren.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/patcomp.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/paths.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcmpl-cvs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcmpl-gnu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcmpl-linux.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcmpl-rpm.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcmpl-unix.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcomplete.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcvs-defs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcvs-info.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcvs-parse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcvs-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pcvs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pgg-def.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pgg-gpg.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pgg-parse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pgg-pgp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pgg-pgp5.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/pgg.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/printing.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ps-bdf.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ps-mule.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ps-print.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/recentf.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/rect.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/register.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/repeat.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/replace.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/reposition.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/resume.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/reveal.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/rfn-eshadow.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/rot13.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ruler-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/s-region.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/savehist.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/saveplace.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/sb-image.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/scroll-all.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/scroll-bar.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/scroll-lock.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/select.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/server.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/ses.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/shadowfile.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/shell.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/simple.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/skeleton.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/smerge-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/sort.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/soundex.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/speedbar.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/startup.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/strokes.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/subdirs.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/subr.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/t-mouse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/tabify.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/talk.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/tar-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/tempo.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/term.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/terminal.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/thingatpt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/thumbs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/time-stamp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/time.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/timezone.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/tmm.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/tool-bar.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/tooltip.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/tree-widget.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/tutorial.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/type-break.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/uniquify.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/userlock.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-arch.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-cvs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-hooks.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-mcvs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-rcs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-sccs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc-svn.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vcursor.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/version.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/view.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vms-patch.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vmsproc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vt-control.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/vt100-led.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/w32-fns.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/w32-vars.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/wdired.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/whitespace.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/wid-browse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/wid-edit.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/widget.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/windmove.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/window.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/winner.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/woman.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/x-dnd.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/xml.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/xt-mouse.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp 0755 root bin
+f none usr/share/emacs/23.1/lisp/COPYING 0444 root bin
+f none usr/share/emacs/23.1/lisp/README 0444 root bin
+f none usr/share/emacs/23.1/lisp/abbrev.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/abbrevlist.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/add-log.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/align.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/allout.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ansi-color.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/apropos.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/arc-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/array.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/autoarg.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/autoinsert.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/autorevert.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/avoid.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/battery.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/bindings.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/bookmark.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/bs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/buff-menu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/button.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calculator.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/case-table.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/cdl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/chistory.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/cmuscheme.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/comint.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/compare-w.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/complete.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/completion.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/composite.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/cus-dep.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/cus-edit.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/cus-face.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/cus-load.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/cus-start.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/cus-theme.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/custom.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/cvs-status.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/dabbrev.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/delim-col.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/delsel.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/descr-text.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/desktop.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/dframe.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/diff-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/diff.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/dired-aux.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/dired-x.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/dired.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/dirtrack.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/disp-table.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/dnd.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/doc-view.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/dos-fns.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/dos-vars.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/dos-w32.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/double.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ebuff-menu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/echistory.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-diff.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-help.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-hook.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-init.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-merg.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-mult.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-ptch.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-vers.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff-wind.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ediff.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/edmacro.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ehelp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/electric.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/elide-head.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lock.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emerge.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/env.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/epa-dired.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/epa-file.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/epa-hook.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/epa-mail.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/epa.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/epg-config.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/epg.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/expand.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ezimage.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/face-remap.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/facemenu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/faces.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ffap.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/filecache.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/files.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/filesets.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/find-cmd.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/find-dired.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/find-file.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/find-lisp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/finder-inf.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/finder.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/flow-ctrl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/foldout.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/follow.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/font-core.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/font-lock.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/format-spec.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/format.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/forms-d2.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/forms-pass.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/forms.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/frame.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/fringe.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/generic-x.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/help-at-pt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/help-fns.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/help-macro.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/help-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/help.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/hex-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/hexl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/hi-lock.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/hilit-chg.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/hippie-exp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/hl-line.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ibuf-ext.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ibuf-macs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ibuffer.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/icomplete.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ido.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ielm.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/iimage.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/image-dired.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/image-file.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/image-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/image.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/imenu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/indent.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/info-look.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/info-xref.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/info.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/informat.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/isearch.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/isearchb.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/iswitchb.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/jit-lock.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/jka-cmpr-hook.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/jka-compr.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/json.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/kermit.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/kmacro.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ldefs-boot.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/ledit.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/linum.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/loaddefs.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/loadhist.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/loadup.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/locate.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/log-edit.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/log-view.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/longlines.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/lpr.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ls-lisp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/macros.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/makesum.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/man.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/master.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mb-depth.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/md4.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/menu-bar.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/midnight.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/minibuf-eldef.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/minibuffer.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/misc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/misearch.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mouse-copy.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mouse-drag.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mouse-sel.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mouse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/msb.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mwheel.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/newcomment.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/novice.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/outline.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/paren.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/password-cache.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/patcomp.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/paths.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcmpl-cvs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcmpl-gnu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcmpl-linux.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcmpl-rpm.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcmpl-unix.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcomplete.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcvs-defs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcvs-info.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcvs-parse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcvs-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pcvs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pgg-def.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pgg-gpg.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pgg-parse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pgg-pgp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pgg-pgp5.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/pgg.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/printing.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/proced.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ps-bdf.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ps-def.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ps-mule.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ps-print.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ps-samp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/recentf.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/rect.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/register.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/repeat.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/replace.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/reposition.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/reveal.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/rfn-eshadow.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/rot13.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ruler-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/s-region.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/savehist.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/saveplace.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/sb-image.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/scroll-all.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/scroll-bar.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/scroll-lock.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/select.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/server.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/ses.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/sha1.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/shadowfile.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/shell.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/simple.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/skeleton.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/smerge-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/sort.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/soundex.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/speedbar.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/startup.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/strokes.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/subdirs.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/subr.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/t-mouse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/tabify.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/talk.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/tar-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/tempo.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/terminal.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/thingatpt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/thumbs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/time-stamp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/time.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/timezone.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/tmm.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/tool-bar.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/tooltip.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/tree-widget.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/tutorial.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/type-break.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/uniquify.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/userlock.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-annotate.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-arch.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-bzr.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-cvs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-dav.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-dir.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-dispatcher.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-git.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-hg.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-hooks.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-mtn.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-rcs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-sccs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc-svn.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vcursor.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/version.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/view.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vt-control.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/vt100-led.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/w32-fns.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/w32-vars.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/wdired.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/whitespace.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/wid-browse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/wid-edit.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/widget.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/windmove.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/window.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/winner.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/woman.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/x-dnd.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/xml.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/xt-mouse.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/calc 0755 root bin
-f none usr/share/emacs/22.1/lisp/calc/README 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-aent.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-alg.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-arith.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-bin.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-comb.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-cplx.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-embed.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-ext.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-fin.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-forms.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-frac.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-funcs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-graph.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-help.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-incom.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-keypd.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-lang.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-macs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-map.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-math.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-misc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-mtx.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-poly.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-prog.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-rewr.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-rules.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-sel.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-stat.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-store.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-stuff.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-trail.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-undo.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-units.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-vec.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc-yank.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calcalg2.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calcalg3.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calccomp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calc/calcsel2.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/calc 0755 root bin
+f none usr/share/emacs/23.1/lisp/calc/README 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/README.prev 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-aent.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-alg.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-arith.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-bin.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-comb.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-cplx.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-embed.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-ext.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-fin.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-forms.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-frac.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-funcs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-graph.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-help.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-incom.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-keypd.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-lang.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-loaddefs.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-macs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-map.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-math.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-menu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-misc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-mtx.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-nlfit.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-poly.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-prog.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-rewr.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-rules.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-sel.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-stat.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-store.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-stuff.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-trail.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-undo.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-units.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-vec.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc-yank.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calcalg2.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calcalg3.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calccomp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calc/calcsel2.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/calendar 0755 root bin
-f none usr/share/emacs/22.1/lisp/calendar/appt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-bahai.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-china.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-coptic.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-dst.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-french.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-hebrew.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-html.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-islam.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-iso.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-julian.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-mayan.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-menu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-move.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-persia.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-tex.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/cal-x.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/calendar.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/diary-lib.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/holidays.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/icalendar.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/lunar.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/parse-time.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/solar.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/time-date.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/timeclock.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/calendar/todo-mode.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/calendar 0755 root bin
+f none usr/share/emacs/23.1/lisp/calendar/appt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-bahai.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-china.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-coptic.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-dst.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-french.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-hebrew.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-html.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-islam.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-iso.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-julian.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-loaddefs.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-mayan.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-menu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-move.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-persia.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-tex.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/cal-x.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/calendar.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/diary-lib.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/diary-loaddefs.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/hol-loaddefs.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/holidays.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/icalendar.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/lunar.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/parse-time.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/solar.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/time-date.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/timeclock.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/calendar/todo-mode.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/emacs-lisp 0755 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/advice.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/assoc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/authors.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/autoload.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/backquote.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/benchmark.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/bindat.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/byte-opt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/byte-run.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/bytecomp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/checkdoc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl-compat.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl-extra.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl-indent.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl-macs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl-seq.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl-specs.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/copyright.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/crm.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/cust-print.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/debug.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/derived.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/disass.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/easy-mmode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/easymenu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/edebug.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/eldoc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/elint.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/elp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/ewoc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/find-func.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/find-gc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/float-sup.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/generic.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/gulp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/helper.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/levents.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/lisp-mnt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/lisp-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/lisp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/lmenu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/lselect.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/lucid.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/macroexp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/map-ynp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/pp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/re-builder.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/regexp-opt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/regi.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/ring.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/rx.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/shadow.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/sregex.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/syntax.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/tcover-ses.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/tcover-unsafep.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/testcover.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/timer.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/tq.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/trace.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/unsafep.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emacs-lisp/warnings.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/emacs-lisp 0755 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/advice.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/assoc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/authors.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/autoload.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/avl-tree.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/backquote.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/benchmark.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/bindat.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/byte-opt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/byte-run.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/bytecomp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/check-declare.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/checkdoc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl-compat.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl-extra.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl-indent.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl-loaddefs.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl-macs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl-seq.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl-specs.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/copyright.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/crm.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/cust-print.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/debug.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/derived.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/disass.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/easy-mmode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/easymenu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/edebug.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/eldoc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/elint.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/elp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/ewoc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/find-func.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/find-gc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/float-sup.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/generic.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/gulp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/helper.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/levents.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/lisp-mnt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/lisp-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/lisp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/lmenu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/lucid.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/macroexp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/map-ynp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/pp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/re-builder.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/regexp-opt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/regi.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/ring.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/rx.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/shadow.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/sregex.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/syntax.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/tcover-ses.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/tcover-unsafep.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/testcover.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/timer.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/tq.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/trace.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/unsafep.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emacs-lisp/warnings.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/emulation 0755 root bin
-f none usr/share/emacs/22.1/lisp/emulation/crisp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/cua-base.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/cua-gmrk.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/cua-rect.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/edt-lk201.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/edt-mapper.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/edt-pc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/edt-vt100.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/edt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/keypad.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/pc-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/pc-select.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/tpu-edt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/tpu-extras.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/tpu-mapper.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/vi.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/vip.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-cmd.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-ex.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-init.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-keym.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-macs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-mous.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/viper.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/emulation/ws-mode.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/emulation 0755 root bin
+f none usr/share/emacs/23.1/lisp/emulation/crisp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/cua-base.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/cua-gmrk.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/cua-rect.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/edt-lk201.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/edt-mapper.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/edt-pc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/edt-vt100.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/edt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/keypad.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/pc-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/pc-select.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/tpu-edt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/tpu-extras.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/tpu-mapper.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/vi.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/vip.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-cmd.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-ex.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-init.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-keym.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-macs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-mous.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/viper.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/emulation/ws-mode.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/erc 0755 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-autoaway.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-backend.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-button.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-capab.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-compat.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-dcc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-ezbounce.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-fill.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-goodies.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-hecomplete.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-ibuffer.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-identd.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-imenu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-join.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-lang.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-log.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-match.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-menu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-netsplit.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-networks.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-nicklist.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-notify.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-page.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-pcomplete.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-replace.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-ring.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-services.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-sound.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-speedbar.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-spelling.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-stamp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-track.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-truncate.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc-xdcc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/erc/erc.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/erc 0755 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-autoaway.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-backend.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-button.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-capab.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-compat.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-dcc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-ezbounce.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-fill.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-goodies.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-hecomplete.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-ibuffer.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-identd.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-imenu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-join.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-lang.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-list.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-log.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-match.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-menu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-netsplit.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-networks.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-notify.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-page.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-pcomplete.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-replace.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-ring.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-services.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-sound.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-speedbar.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-spelling.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-stamp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-track.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-truncate.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc-xdcc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/erc/erc.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/eshell 0755 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-alias.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-banner.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-basic.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-cmpl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-dirs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-glob.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-hist.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-ls.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-pred.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-prompt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-rebind.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-script.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-smart.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-term.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-unix.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/em-xtra.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-arg.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-cmd.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-ext.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-groups.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-io.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-maint.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-module.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-opt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-proc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-test.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/esh-var.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/eshell/eshell.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/eshell 0755 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-alias.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-banner.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-basic.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-cmpl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-dirs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-glob.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-hist.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-ls.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-pred.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-prompt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-rebind.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-script.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-smart.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-term.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-unix.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/em-xtra.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-arg.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-cmd.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-ext.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-groups.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-io.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-module.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-opt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-proc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-test.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/esh-var.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/eshell/eshell.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/gnus 0755 root bin
-f none usr/share/emacs/22.1/lisp/gnus/binhex.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/canlock.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/compface.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/deuglify.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/dig.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/dns.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/earcon.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/flow-fill.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/format-spec.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gmm-utils.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-agent.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-art.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-async.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-audio.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-bcklg.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-cache.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-cite.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-cus.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-delay.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-demon.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-diary.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-dired.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-draft.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-dup.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-eform.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-ems.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-fun.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-gl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-group.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-int.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-kill.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-logic.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-mh.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-ml.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-mlspl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-move.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-msg.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-nocem.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-picon.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-range.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-registry.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-salt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-score.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-setup.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-sieve.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-soup.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-spec.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-srvr.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-start.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-sum.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-topic.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-undo.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-uu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-vm.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus-win.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/gnus.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/hex-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/html2text.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/ietf-drums.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/imap.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/legacy-gnus-agent.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mail-parse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mail-prsvr.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mail-source.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mailcap.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/message.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/messcompat.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-bodies.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-decode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-encode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-extern.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-partial.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-url.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-uu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mm-view.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mml-sec.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mml-smime.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mml.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mml1991.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/mml2015.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnagent.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnbabyl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nndb.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nndiary.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nndir.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nndoc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nndraft.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nneething.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnfolder.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nngateway.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnheader.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnimap.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnkiboze.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnlistserv.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnmail.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnmaildir.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnmbox.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnmh.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnml.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnnil.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnoo.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnrss.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnslashdot.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnsoup.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnspool.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nntp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnultimate.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnvirtual.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnwarchive.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnweb.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/nnwfm.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/pop3.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/qp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/rfc1843.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/rfc2045.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/rfc2047.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/rfc2104.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/rfc2231.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/score-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/sha1.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/sieve-manage.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/sieve-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/sieve.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/smiley.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/smime.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/spam-report.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/spam-stat.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/spam.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/starttls.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/utf7.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/uudecode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/webmail.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/gnus/yenc.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/gnus 0755 root bin
+f none usr/share/emacs/23.1/lisp/gnus/auth-source.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/canlock.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/compface.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/deuglify.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/earcon.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/ecomplete.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/flow-fill.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gmm-utils.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-agent.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-art.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-async.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-audio.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-bcklg.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-bookmark.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-cache.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-cite.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-cus.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-delay.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-demon.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-diary.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-dired.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-draft.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-dup.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-eform.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-ems.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-fun.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-group.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-int.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-kill.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-logic.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-mh.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-ml.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-mlspl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-move.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-msg.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-nocem.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-picon.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-range.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-registry.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-salt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-score.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-setup.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-sieve.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-soup.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-spec.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-srvr.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-start.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-sum.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-topic.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-undo.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-uu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-vm.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus-win.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/gnus.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/html2text.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/ietf-drums.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/legacy-gnus-agent.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mail-parse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mail-prsvr.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mail-source.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mailcap.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/message.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/messcompat.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-bodies.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-decode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-encode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-extern.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-partial.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-url.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-uu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mm-view.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mml-sec.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mml-smime.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mml.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mml1991.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/mml2015.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnagent.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnbabyl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nndb.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nndiary.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nndir.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nndoc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nndraft.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nneething.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnfolder.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nngateway.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnheader.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnimap.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnir.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnkiboze.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnlistserv.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnmail.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnmaildir.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnmairix.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnmbox.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnmh.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnml.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnnil.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnoo.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnrss.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnslashdot.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnsoup.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnspool.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nntp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnultimate.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnvirtual.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnwarchive.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnweb.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/nnwfm.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/pop3.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/qp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/rfc1843.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/rfc2045.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/rfc2047.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/rfc2104.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/rfc2231.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/score-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/sieve-manage.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/sieve-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/sieve.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/smiley.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/smime.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/spam-report.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/spam-stat.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/spam-wash.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/spam.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/starttls.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/utf7.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/webmail.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/gnus/yenc.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/international 0755 root bin
-f none usr/share/emacs/22.1/lisp/international/ccl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/characters.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/code-pages.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/codepage.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/encoded-kb.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/fontset.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/isearch-x.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/iso-ascii.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/iso-cvt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/iso-transl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/ja-dic-cnv.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/ja-dic-utl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/kinsoku.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/kkc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/latexenc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/latin-1.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/latin-2.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/latin-3.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/latin-4.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/latin-5.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/latin-8.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/latin-9.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/latin1-disp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/mule-cmds.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/mule-conf.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/mule-diag.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/mule-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/mule.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/ogonek.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/quail.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/subst-big5.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/subst-gb2312.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/subst-jis.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/subst-ksc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/titdic-cnv.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/ucs-tables.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/utf-16.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/utf-7.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/international/utf-8.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/international 0755 root bin
+f none usr/share/emacs/23.1/lisp/international/README 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/ccl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/characters.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/charprop.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/cp51932.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/encoded-kb.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/eucjp-ms.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/fontset.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/isearch-x.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/iso-ascii.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/iso-cvt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/iso-transl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/ja-dic-cnv.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/ja-dic-utl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/kinsoku.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/kkc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/latexenc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/latin1-disp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/mule-cmds.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/mule-conf.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/mule-diag.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/mule-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/mule.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/ogonek.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/quail.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/robin.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/titdic-cnv.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-bidi.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-category.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-combining.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-comment.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-decimal.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-decomposition.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-digit.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-lowercase.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-mirrored.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-name.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-numeric.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-old-name.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-titlecase.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/uni-uppercase.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/international/utf-7.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/language 0755 root bin
-f none usr/share/emacs/22.1/lisp/language/china-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/chinese.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/cyril-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/cyrillic.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/czech.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/devan-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/devanagari.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/english.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/ethio-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/ethiopic.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/european.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/georgian.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/greek.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/hebrew.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/ind-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/indian.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/japan-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/japanese.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/kannada.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/knd-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/korea-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/korean.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/lao-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/lao.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/malayalam.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/misc-lang.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/mlm-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/romanian.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/slovak.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/tamil.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/thai-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/thai-word.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/thai.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/tibet-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/tibetan.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/tml-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/utf-8-lang.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/viet-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/language/vietnamese.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/language 0755 root bin
+f none usr/share/emacs/23.1/lisp/language/burmese.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/cham.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/china-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/chinese.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/cyril-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/cyrillic.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/czech.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/english.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/ethio-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/ethiopic.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/european.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/georgian.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/greek.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/hanja-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/hebrew.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/ind-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/indian.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/japan-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/japanese.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/khmer.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/korea-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/korean.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/lao-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/lao.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/misc-lang.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/romanian.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/sinhala.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/slovak.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/tai-viet.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/thai-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/thai-word.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/thai.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/tibet-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/tibetan.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/tv-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/utf-8-lang.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/viet-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/language/vietnamese.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/mail 0755 root bin
-f none usr/share/emacs/22.1/lisp/mail/blessmail.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/emacsbug.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/feedmail.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/footnote.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mail-extr.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mail-hist.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mail-utils.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mailabbrev.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mailalias.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mailclient.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mailheader.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mailpost.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/metamail.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/mspools.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/reporter.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rfc2368.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rfc822.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmail-spam-filter.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmail.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmailedit.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmailkwd.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmailmsc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmailout.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmailsort.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/rmailsum.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/sendmail.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/smtpmail.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/supercite.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/uce.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/undigest.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/unrmail.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mail/vms-pmail.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/mail 0755 root bin
+f none usr/share/emacs/23.1/lisp/mail/binhex.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/blessmail.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/emacsbug.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/feedmail.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/footnote.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/hashcash.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mail-extr.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mail-hist.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mail-utils.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mailabbrev.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mailalias.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mailclient.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mailheader.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mailpost.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/metamail.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/mspools.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/reporter.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rfc2368.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rfc822.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmail-spam-filter.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmail.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailedit.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailkwd.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailmm.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailmsc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailout.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailsort.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/rmailsum.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/sendmail.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/smtpmail.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/supercite.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/uce.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/undigest.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/unrmail.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mail/uudecode.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/mh-e 0755 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-acros.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-alias.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-buffers.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-comp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-compat.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-e.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-folder.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-funcs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-gnus.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-identity.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-inc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-junk.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-letter.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-limit.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-loaddefs.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-mime.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-print.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-scan.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-search.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-seq.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-show.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-speed.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-thread.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-tool-bar.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-utils.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/mh-e/mh-xface.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/mh-e 0755 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-acros.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-alias.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-buffers.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-comp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-compat.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-e.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-folder.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-funcs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-gnus.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-identity.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-inc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-junk.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-letter.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-limit.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-loaddefs.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-mime.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-print.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-scan.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-search.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-seq.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-show.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-speed.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-thread.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-tool-bar.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-utils.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/mh-e/mh-xface.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/net 0755 root bin
-f none usr/share/emacs/22.1/lisp/net/ange-ftp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/browse-url.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudc-bob.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudc-export.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudc-hotlist.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudc-vars.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudcb-bbdb.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudcb-ldap.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudcb-mab.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/eudcb-ph.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/goto-addr.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/ldap.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/net-utils.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/netrc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/newsticker.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/quickurl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/rcirc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/rcompile.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/rlogin.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/snmp-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/telnet.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tls.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tramp-ftp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tramp-smb.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tramp-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tramp-uu.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tramp-vc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/tramp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/trampver.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/net/webjump.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/net 0755 root bin
+f none usr/share/emacs/23.1/lisp/net/ange-ftp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/browse-url.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/dbus.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/dig.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/dns.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudc-bob.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudc-export.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudc-hotlist.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudc-vars.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudcb-bbdb.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudcb-ldap.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudcb-mab.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/eudcb-ph.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/goto-addr.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/hmac-def.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/hmac-md5.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/imap.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/ldap.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/mairix.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/net-utils.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/netrc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/newst-backend.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/newst-plainview.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/newst-reader.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/newst-ticker.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/newst-treeview.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/newsticker.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/ntlm.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/quickurl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/rcirc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/rcompile.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/rlogin.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/sasl-cram.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/sasl-digest.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/sasl-ntlm.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/sasl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/snmp-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/socks.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/telnet.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tls.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-cache.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-cmds.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-compat.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-fish.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-ftp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-gw.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-smb.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp-uu.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/tramp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/trampver.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/webjump.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/xesam.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/net/zeroconf.elc 0444 root bin
+
+
+d none usr/share/emacs/23.1/lisp/nxml 0755 root bin
+f none usr/share/emacs/23.1/lisp/nxml/TODO 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-enc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-glyph.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-maint.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-ns.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-outln.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-parse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-rap.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-uchnm.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/nxml-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-cmpct.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-dt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-loc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-maint.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-match.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-nxml.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-parse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-pttrn.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-uri.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-valid.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/rng-xsd.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/xmltok.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/nxml/xsd-regexp.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/obsolete 0755 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/auto-show.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/awk-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/bg-mouse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/fast-lock.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/float.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/hilit19.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/hscroll.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/iso-acc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/iso-insert.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/iso-swed.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/keyswap.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/lazy-lock.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/mlsupport.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/ooutline.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/options.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/profile.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/rnews.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/rnewspost.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/rsz-mini.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/sc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/scribe.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/sun-curs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/sun-fns.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/swedish.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/uncompress.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/x-apollo.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/obsolete/x-menu.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/obsolete 0755 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/awk-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/fast-lock.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/iso-acc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/iso-insert.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/iso-swed.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/keyswap.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/lazy-lock.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/old-whitespace.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/options.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/resume.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/rnews.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/rnewspost.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/sc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/scribe.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/swedish.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/vc-mcvs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/obsolete/x-menu.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/play 0755 root bin
-f none usr/share/emacs/22.1/lisp/play/5x5.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/animate.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/blackbox.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/bruce.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/cookie1.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/decipher.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/dissociate.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/doctor.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/dunnet.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/fortune.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/gamegrid.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/gametree.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/gomoku.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/handwrite.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/hanoi.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/landmark.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/life.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/meese.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/morse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/mpuz.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/pong.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/snake.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/solitaire.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/spook.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/studly.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/tetris.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/yow.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/play/zone.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/org 0755 root bin
+f none usr/share/emacs/23.1/lisp/org/org-agenda.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-archive.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-attach.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-bbdb.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-bibtex.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-clock.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-colview.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-compat.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-exp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-export-latex.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-faces.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-footnote.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-gnus.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-id.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-info.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-install.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-irc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-jsinfo.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-list.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-mac-message.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-macs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-mew.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-mhe.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-mouse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-plot.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-publish.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-remember.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-rmail.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-table.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-timer.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-vm.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-w3m.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org-wl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/org/org.elc 0444 root bin
+
+
+d none usr/share/emacs/23.1/lisp/play 0755 root bin
+f none usr/share/emacs/23.1/lisp/play/5x5.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/animate.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/blackbox.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/bruce.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/bubbles.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/cookie1.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/decipher.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/dissociate.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/doctor.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/dunnet.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/fortune.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/gamegrid.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/gametree.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/gomoku.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/handwrite.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/hanoi.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/landmark.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/life.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/meese.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/morse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/mpuz.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/pong.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/snake.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/solitaire.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/spook.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/studly.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/tetris.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/yow.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/play/zone.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/progmodes 0755 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ada-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ada-prj.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ada-stmt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ada-xref.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/antlr-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/asm-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/autoconf.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-align.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-awk.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-bytecomp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-cmds.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-compat.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-defs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-engine.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-fonts.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-langs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-menus.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-styles.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-subword.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cc-vars.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cfengine.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cmacexp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/compile.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cperl-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cpp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/cwarn.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/dcl-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/delphi.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-abn.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-bnf.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-dtd.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-ebx.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-iso.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-otz.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf-yac.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebnf2ps.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ebrowse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/etags.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/executable.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/f90.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/flymake.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/fortran.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/gdb-ui.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/glasses.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/grep.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/gud.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/hideif.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/hideshow.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/icon.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/idlw-complete-structtag.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/idlw-help.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/idlw-shell.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/idlw-toolbar.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/idlwave.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/inf-lisp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ld-script.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/m4-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/make-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/mantemp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/meta-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/mixal-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/modula2.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/octave-hlp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/octave-inf.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/octave-mod.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/pascal.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/perl-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/prolog.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/ps-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/python.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/scheme.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/sh-script.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/simula.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/sql.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/tcl.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/vhdl-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/which-func.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/progmodes/xscheme.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/progmodes 0755 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ada-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ada-prj.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ada-stmt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ada-xref.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/antlr-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/asm-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/autoconf.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/bug-reference.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cap-words.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-align.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-awk.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-bytecomp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-cmds.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-compat.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-defs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-engine.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-fonts.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-langs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-menus.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-styles.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-subword.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cc-vars.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cfengine.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cmacexp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/compile.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cperl-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cpp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/cwarn.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/dcl-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/delphi.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-abn.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-bnf.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-dtd.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-ebx.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-iso.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-otz.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf-yac.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebnf2ps.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ebrowse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/etags.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/executable.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/f90.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/flymake.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/fortran.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/gdb-ui.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/glasses.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/grep.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/gud.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/hideif.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/hideshow.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/icon.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/idlw-complete-structtag.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/idlw-help.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/idlw-shell.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/idlw-toolbar.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/idlwave.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/inf-lisp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ld-script.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/m4-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/make-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/mantemp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/meta-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/mixal-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/modula2.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/octave-inf.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/octave-mod.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/pascal.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/perl-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/prolog.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ps-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/python.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/ruby-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/scheme.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/sh-script.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/simula.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/sql.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/sym-comp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/tcl.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/vera-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/verilog-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/vhdl-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/which-func.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/progmodes/xscheme.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/term 0755 root bin
-f none usr/share/emacs/22.1/lisp/term/AT386.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/README 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/apollo.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/bobcat.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/cygwin.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/internal.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/iris-ansi.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/linux.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/lk201.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/mac-win.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/news.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/pc-win.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/rxvt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/sun-mouse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/sun.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/sup-mouse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/tty-colors.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/tvi970.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/vt100.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/vt102.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/vt125.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/vt200.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/vt201.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/vt220.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/vt240.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/vt300.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/vt320.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/vt400.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/vt420.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/w32-win.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/wyse50.el 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/x-win.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/term/xterm.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/term 0755 root bin
+f none usr/share/emacs/23.1/lisp/term/AT386.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/README 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/apollo.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/bobcat.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/common-win.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/cygwin.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/internal.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/iris-ansi.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/linux.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/lk201.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/news.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/ns-win.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/pc-win.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/rxvt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/sun.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/sup-mouse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/tty-colors.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/tvi970.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/vt100.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/vt102.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/vt125.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/vt200.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/vt201.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/vt220.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/vt240.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/vt300.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/vt320.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/vt400.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/vt420.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/w32-win.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/w32console.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/wyse50.el 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/x-win.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/term/xterm.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/textmodes 0755 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/artist.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/bib-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/bibtex.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/conf-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/dns-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/enriched.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/fill.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/flyspell.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/ispell.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/makeinfo.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/nroff-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/org.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/page-ext.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/page.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/paragraphs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/picture.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/po.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/refbib.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/refer.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/refill.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-auc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-cite.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-dcr.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-global.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-index.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-parse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-ref.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-sel.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-toc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex-vars.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/reftex.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/sgml-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/spell.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/table.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/tex-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/texinfmt.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/texinfo.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/texnfo-upd.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/text-mode.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/tildify.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/two-column.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/textmodes/underline.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/textmodes 0755 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/artist.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/bib-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/bibtex-style.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/bibtex.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/conf-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/css-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/dns-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/enriched.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/fill.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/flyspell.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/ispell.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/makeinfo.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/nroff-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/page-ext.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/page.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/paragraphs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/picture.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/po.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/refbib.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/refer.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/refill.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-auc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-cite.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-dcr.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-global.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-index.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-parse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-ref.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-sel.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-toc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex-vars.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/reftex.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/remember.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/rst.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/sgml-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/spell.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/table.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/tex-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/texinfmt.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/texinfo.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/texnfo-upd.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/text-mode.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/tildify.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/two-column.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/textmodes/underline.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/lisp/url 0755 root bin
-f none usr/share/emacs/22.1/lisp/url/url-about.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-auth.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-cache.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-cid.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-cookie.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-dav.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-dired.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-expand.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-file.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-ftp.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-gw.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-handlers.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-history.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-http.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-imap.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-irc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-ldap.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-mailto.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-methods.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-misc.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-news.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-nfs.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-ns.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-parse.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-privacy.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-proxy.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-util.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url-vars.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/url.elc 0444 root bin
-f none usr/share/emacs/22.1/lisp/url/vc-dav.elc 0444 root bin
+d none usr/share/emacs/23.1/lisp/url 0755 root bin
+f none usr/share/emacs/23.1/lisp/url/url-about.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-auth.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-cache.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-cid.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-cookie.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-dav.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-dired.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-expand.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-file.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-ftp.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-gw.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-handlers.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-history.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-http.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-imap.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-irc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-ldap.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-mailto.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-methods.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-misc.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-news.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-nfs.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-ns.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-parse.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-privacy.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-proxy.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-util.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url-vars.elc 0444 root bin
+f none usr/share/emacs/23.1/lisp/url/url.elc 0444 root bin
 
 
-d none usr/share/emacs/22.1/site-lisp 0755 root bin
-f none usr/share/emacs/22.1/site-lisp/subdirs.el 0444 root bin
+d none usr/share/emacs/23.1/site-lisp 0755 root bin
+f none usr/share/emacs/23.1/site-lisp/subdirs.el 0444 root bin
 
 
 d none usr/share/emacs/site-lisp 0755 root bin
 f none usr/share/emacs/site-lisp/subdirs.el 0444 root bin
 
 
+d none usr/share/icons 0755 root other
+d none usr/share/icons/hicolor 0755 root other
+d none usr/share/icons/hicolor/128x128 0755 root other
+d none usr/share/icons/hicolor/128x128/apps 0755 root other
+f none usr/share/icons/hicolor/128x128/apps/emacs.png 0444 root bin
+
+
+d none usr/share/icons/hicolor/16x16 0755 root other
+d none usr/share/icons/hicolor/16x16/apps 0755 root other
+f none usr/share/icons/hicolor/16x16/apps/emacs.png 0444 root bin
+f none usr/share/icons/hicolor/16x16/apps/emacs22.png 0444 root bin
+
+
+d none usr/share/icons/hicolor/24x24 0755 root other
+d none usr/share/icons/hicolor/24x24/apps 0755 root other
+f none usr/share/icons/hicolor/24x24/apps/emacs.png 0444 root bin
+f none usr/share/icons/hicolor/24x24/apps/emacs22.png 0444 root bin
+
+
+d none usr/share/icons/hicolor/32x32 0755 root other
+d none usr/share/icons/hicolor/32x32/apps 0755 root other
+f none usr/share/icons/hicolor/32x32/apps/emacs.png 0444 root bin
+f none usr/share/icons/hicolor/32x32/apps/emacs22.png 0444 root bin
+
+
+d none usr/share/icons/hicolor/48x48 0755 root other
+d none usr/share/icons/hicolor/48x48/apps 0755 root other
+f none usr/share/icons/hicolor/48x48/apps/emacs.png 0444 root bin
+f none usr/share/icons/hicolor/48x48/apps/emacs22.png 0444 root bin
+
+
+d none usr/share/icons/hicolor/scalable 0755 root other
+d none usr/share/icons/hicolor/scalable/apps 0755 root other
+f none usr/share/icons/hicolor/scalable/apps/emacs.svg 0444 root bin
+
+
+d none usr/share/icons/hicolor/scalable/mimetypes 0755 root other
+f none usr/share/icons/hicolor/scalable/mimetypes/emacs-document.svg 0444 root bin
+
+
 d none usr/share/info 0755 root bin
 f none usr/share/info/ada-mode 0444 root bin
+f none usr/share/info/auth 0444 root bin
 f none usr/share/info/autotype 0444 root bin
 f none usr/share/info/calc 0444 root bin
 f none usr/share/info/calc-1 0444 root bin
@@ -1746,7 +2311,9 @@
 f none usr/share/info/calc-6 0444 root bin
 f none usr/share/info/ccmode 0444 root bin
 f none usr/share/info/ccmode-1 0444 root bin
+f none usr/share/info/ccmode-2 0444 root bin
 f none usr/share/info/cl 0444 root bin
+f none usr/share/info/dbus 0444 root bin
 f none usr/share/info/dired-x 0444 root bin
 f none usr/share/info/ebrowse 0444 root bin
 f none usr/share/info/ediff 0444 root bin
@@ -1758,6 +2325,7 @@
 f none usr/share/info/elisp 0444 root bin
 f none usr/share/info/elisp-1 0444 root bin
 f none usr/share/info/elisp-10 0444 root bin
+f none usr/share/info/elisp-11 0444 root bin
 f none usr/share/info/elisp-2 0444 root bin
 f none usr/share/info/elisp-3 0444 root bin
 f none usr/share/info/elisp-4 0444 root bin
@@ -1776,6 +2344,7 @@
 f none usr/share/info/emacs-7 0444 root bin
 f none usr/share/info/emacs-8 0444 root bin
 f none usr/share/info/emacs-mime 0444 root bin
+f none usr/share/info/epa 0444 root bin
 f none usr/share/info/erc 0444 root bin
 f none usr/share/info/eshell 0444 root bin
 f none usr/share/info/eudc 0444 root bin
@@ -1789,11 +2358,13 @@
 f none usr/share/info/gnus-5 0444 root bin
 f none usr/share/info/idlwave 0444 root bin
 f none usr/share/info/info 0444 root bin
+f none usr/share/info/mairix-el 0444 root bin
 f none usr/share/info/message 0444 root bin
 f none usr/share/info/mh-e 0444 root bin
 f none usr/share/info/mh-e-1 0444 root bin
 f none usr/share/info/mh-e-2 0444 root bin
 f none usr/share/info/newsticker 0444 root bin
+f none usr/share/info/nxml-mode 0444 root bin
 f none usr/share/info/org 0444 root bin
 f none usr/share/info/org-1 0444 root bin
 f none usr/share/info/org-2 0444 root bin
@@ -1801,6 +2372,8 @@
 f none usr/share/info/pgg 0444 root bin
 f none usr/share/info/rcirc 0444 root bin
 f none usr/share/info/reftex 0444 root bin
+f none usr/share/info/remember 0444 root bin
+f none usr/share/info/sasl 0444 root bin
 f none usr/share/info/sc 0444 root bin
 f none usr/share/info/ses 0444 root bin
 f none usr/share/info/sieve 0444 root bin
@@ -1822,10 +2395,3 @@
 f none usr/share/man/man1/emacsclient.1 0444 root bin
 f none usr/share/man/man1/grep-changelog.1 0444 root bin
 f none usr/share/man/man1/rcs-checkin.1 0444 root bin
-
-
-d none usr/gnu/share 0755 root sys
-d none usr/gnu/share/man 0755 root bin
-d none usr/gnu/share/man/man1 0755 root bin
-f none usr/gnu/share/man/man1/ctags.1 0444 root bin
-f none usr/gnu/share/man/man1/etags.1 0444 root bin
--- a/usr/src/pkgdefs/SUNWgnu-emacs/prototype_i386.tmpl	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs/prototype_i386.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_i386.tmpl	1.1	08/09/16 SMI"
+# ident	"@(#)prototype_i386.tmpl	1.2	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -49,18 +49,19 @@
 # SUNWgnu-emacs
 #
 
+
 d none usr/lib 0755 root bin
 d none usr/lib/emacs 0755 root bin
-d none usr/lib/emacs/22.1 0755 root bin
-d none usr/lib/emacs/22.1/i386-pc-solaris{SOL_REV} 0755 root bin
-s none usr/lib/emacs/22.1/x86_64-pc-solaris{SOL_REV}=i386-pc-solaris{SOL_REV}
-f none usr/lib/emacs/22.1/i386-pc-solaris{SOL_REV}/cvtmail 0555 root bin
-f none usr/lib/emacs/22.1/i386-pc-solaris{SOL_REV}/digest-doc 0555 root bin
-f none usr/lib/emacs/22.1/i386-pc-solaris{SOL_REV}/fakemail 0555 root bin
-f none usr/lib/emacs/22.1/i386-pc-solaris{SOL_REV}/hexl 0555 root bin
-f none usr/lib/emacs/22.1/i386-pc-solaris{SOL_REV}/movemail 0555 root bin
-f none usr/lib/emacs/22.1/i386-pc-solaris{SOL_REV}/profile 0555 root bin
-f none usr/lib/emacs/22.1/i386-pc-solaris{SOL_REV}/rcs2log 0555 root bin
-f none usr/lib/emacs/22.1/i386-pc-solaris{SOL_REV}/sorted-doc 0555 root bin
-f none usr/lib/emacs/22.1/i386-pc-solaris{SOL_REV}/update-game-score 0555 root bin
-f none usr/lib/emacs/22.1/i386-pc-solaris{SOL_REV}/vcdiff 0555 root bin
+d none usr/lib/emacs/23.1 0755 root bin
+d none usr/lib/emacs/23.1/i386-pc-solaris{SOL_REV} 0755 root bin
+s none usr/lib/emacs/23.1/x86_64-pc-solaris{SOL_REV}=i386-pc-solaris{SOL_REV}
+f none usr/lib/emacs/23.1/i386-pc-solaris{SOL_REV}/cvtmail 0555 root bin
+f none usr/lib/emacs/23.1/i386-pc-solaris{SOL_REV}/digest-doc 0555 root bin
+f none usr/lib/emacs/23.1/i386-pc-solaris{SOL_REV}/fakemail 0555 root bin
+f none usr/lib/emacs/23.1/i386-pc-solaris{SOL_REV}/hexl 0555 root bin
+f none usr/lib/emacs/23.1/i386-pc-solaris{SOL_REV}/movemail 0555 root bin
+f none usr/lib/emacs/23.1/i386-pc-solaris{SOL_REV}/profile 0555 root bin
+f none usr/lib/emacs/23.1/i386-pc-solaris{SOL_REV}/rcs2log 0555 root bin
+f none usr/lib/emacs/23.1/i386-pc-solaris{SOL_REV}/sorted-doc 0555 root bin
+f none usr/lib/emacs/23.1/i386-pc-solaris{SOL_REV}/update-game-score 0555 root bin
+f none usr/lib/emacs/23.1/i386-pc-solaris{SOL_REV}/vcdiff 0555 root bin
--- a/usr/src/pkgdefs/SUNWgnu-emacs/prototype_sparc.tmpl	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs/prototype_sparc.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_sparc.tmpl	1.1	08/09/16 SMI"
+# ident	"@(#)prototype_sparc.tmpl	1.2	09/10/29 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -49,17 +49,18 @@
 # SUNWgnu-emacs
 #
 
+
 d none usr/lib 0755 root bin
 d none usr/lib/emacs 0755 root bin
-d none usr/lib/emacs/22.1 0755 root bin
-d none usr/lib/emacs/22.1/sparc-sun-solaris{SOL_REV} 0755 root bin
-f none usr/lib/emacs/22.1/sparc-sun-solaris{SOL_REV}/cvtmail 0555 root bin
-f none usr/lib/emacs/22.1/sparc-sun-solaris{SOL_REV}/digest-doc 0555 root bin
-f none usr/lib/emacs/22.1/sparc-sun-solaris{SOL_REV}/fakemail 0555 root bin
-f none usr/lib/emacs/22.1/sparc-sun-solaris{SOL_REV}/hexl 0555 root bin
-f none usr/lib/emacs/22.1/sparc-sun-solaris{SOL_REV}/movemail 0555 root bin
-f none usr/lib/emacs/22.1/sparc-sun-solaris{SOL_REV}/profile 0555 root bin
-f none usr/lib/emacs/22.1/sparc-sun-solaris{SOL_REV}/rcs2log 0555 root bin
-f none usr/lib/emacs/22.1/sparc-sun-solaris{SOL_REV}/sorted-doc 0555 root bin
-f none usr/lib/emacs/22.1/sparc-sun-solaris{SOL_REV}/update-game-score 0555 root bin
-f none usr/lib/emacs/22.1/sparc-sun-solaris{SOL_REV}/vcdiff 0555 root bin
+d none usr/lib/emacs/23.1 0755 root bin
+d none usr/lib/emacs/23.1/sparc-sun-solaris{SOL_REV} 0755 root bin
+f none usr/lib/emacs/23.1/sparc-sun-solaris{SOL_REV}/cvtmail 0555 root bin
+f none usr/lib/emacs/23.1/sparc-sun-solaris{SOL_REV}/digest-doc 0555 root bin
+f none usr/lib/emacs/23.1/sparc-sun-solaris{SOL_REV}/fakemail 0555 root bin
+f none usr/lib/emacs/23.1/sparc-sun-solaris{SOL_REV}/hexl 0555 root bin
+f none usr/lib/emacs/23.1/sparc-sun-solaris{SOL_REV}/movemail 0555 root bin
+f none usr/lib/emacs/23.1/sparc-sun-solaris{SOL_REV}/profile 0555 root bin
+f none usr/lib/emacs/23.1/sparc-sun-solaris{SOL_REV}/rcs2log 0555 root bin
+f none usr/lib/emacs/23.1/sparc-sun-solaris{SOL_REV}/sorted-doc 0555 root bin
+f none usr/lib/emacs/23.1/sparc-sun-solaris{SOL_REV}/update-game-score 0555 root bin
+f none usr/lib/emacs/23.1/sparc-sun-solaris{SOL_REV}/vcdiff 0555 root bin
--- a/usr/src/pkgdefs/SUNWneon/depend	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWneon/depend	Sun Dec 20 07:12:51 2009 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -23,7 +23,7 @@
 #
 #		All Rights Reserved.
 #
-#ident	"@(#)depend	1.2	08/12/04 SMI"
+#ident	"@(#)depend	1.3	09/10/29 SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -51,3 +51,4 @@
 P SUNWopenssl-libraries	OpenSSL Libraries (Usr)
 P SUNWlxml	The XML library
 P SUNWzlib	The Zip compression library
+P SUNWlibproxy	automatic proxy configuration management
--- a/usr/src/pkgdefs/SUNWneon/pkginfo.tmpl	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWneon/pkginfo.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.1	07/02/24 SMI"
+#ident	"@(#)pkginfo.tmpl	1.2	09/09/24 SMI"
 #
 #
 # This required package information file describes characteristics of the
@@ -38,7 +38,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="The Neon WebDAV library (0.25.5)"
+DESC="The Neon WebDAV library (0.29.0)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWneon/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWneon/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.2	09/09/04 SMI"
+#ident	"@(#)prototype_com	1.3	09/09/24 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -43,13 +43,14 @@
 #
 # SUNWneon
 #
-d none usr 755 root sys
-d none usr/bin 755 root bin
+d none usr 0755 root sys
+d none usr/bin 0755 root bin
 f none usr/bin/neon-config 0755 root bin
-d none usr/include 755 root bin
-d none usr/include/neon 755 root bin
+d none usr/include 0755 root bin
+d none usr/include/neon 0755 root bin
 f none usr/include/neon/ne_207.h 0644 root bin
 f none usr/include/neon/ne_acl.h 0644 root bin
+f none usr/include/neon/ne_acl3744.h 0644 root bin
 f none usr/include/neon/ne_alloc.h 0644 root bin
 f none usr/include/neon/ne_auth.h 0644 root bin
 f none usr/include/neon/ne_basic.h 0644 root bin
@@ -59,6 +60,7 @@
 f none usr/include/neon/ne_i18n.h 0644 root bin
 f none usr/include/neon/ne_locks.h 0644 root bin
 f none usr/include/neon/ne_md5.h 0644 root bin
+f none usr/include/neon/ne_pkcs11.h 0644 root bin
 f none usr/include/neon/ne_props.h 0644 root bin
 f none usr/include/neon/ne_redirect.h 0644 root bin
 f none usr/include/neon/ne_request.h 0644 root bin
@@ -70,75 +72,66 @@
 f none usr/include/neon/ne_utils.h 0644 root bin
 f none usr/include/neon/ne_xml.h 0644 root bin
 f none usr/include/neon/ne_xmlreq.h 0644 root bin
-d none usr/lib 755 root bin
-f none usr/lib/libneon.so.25.0.5 0755 root bin
-s none usr/lib/libneon.so.25=libneon.so.25.0.5
-s none usr/lib/libneon.so=libneon.so.25.0.5
+d none usr/lib 0755 root bin
+f none usr/lib/libneon.so.27.2.0 0755 root bin
+s none usr/lib/libneon.so.27=libneon.so.27.2.0
+s none usr/lib/libneon.so=libneon.so.27.2.0
 d none usr/lib/pkgconfig 755 root other
 f none usr/lib/pkgconfig/neon.pc 0644 root bin
-d none usr/share 755 root sys
-d none usr/share/doc 755 root other
-d none usr/share/doc/neon-0.25.5 755 root bin
-d none usr/share/doc/neon-0.25.5/html 755 root bin
-f none usr/share/doc/neon-0.25.5/html/apas01.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/apas02.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/apas03.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/apas04.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/apas05.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/apas06.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/apas07.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/apas08.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/apas09.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/apas10.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/apas11.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/apas12.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/api.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/biblio.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/compliance.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/features.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/gfdl.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/index.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/intro.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/ref.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refalloc.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refauth.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refbuf.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refbufapp.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refbufcr.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refbufdest.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refbufutil.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refcert.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refclicert.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refconfig.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/referr.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refgetst.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refiaddr.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refneon.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refopts.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refreq.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refreqbody.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refreqhdr.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refreqopts.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refresolve.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refresphdr.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refsess.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refshave.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refsockinit.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refsslca.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refsslcert2.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refsslcertio.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refssldname.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refsslvfy.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refstatus.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/reftok.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refvers.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/refxml.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/using.html 0644 root bin
-f none usr/share/doc/neon-0.25.5/html/xml.html 0644 root bin
-d none usr/share/man 755 root bin
-d none usr/share/man/man1 755 root bin
+d none usr/share 0755 root sys
+d none usr/share/doc 0755 root other
+d none usr/share/doc/neon-0.29.0 0755 root bin
+d none usr/share/doc/neon-0.29.0/html 0755 root bin
+f none usr/share/doc/neon-0.29.0/html/api.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/biblio.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/compliance.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/features.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/index.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/intro.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/ref.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refalloc.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refauth.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refbuf.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refbufapp.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refbufcr.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refbufdest.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refbufutil.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refcert.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refclicert.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refconfig.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/referr.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/reffeat.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refgetst.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refi18n.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refiaddr.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refneon.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refopts.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refreq.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refreqbody.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refreqflags.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refreqhdr.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refresolve.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refresphdr.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refsess.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refsessflags.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refshave.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refsockinit.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refsslca.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refsslcert2.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refsslcertio.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refssldname.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refsslvfy.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refstatus.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/reftok.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refvers.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/refxml.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/security.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/using.html 0644 root bin
+f none usr/share/doc/neon-0.29.0/html/xml.html 0644 root bin
+d none usr/share/man 0755 root bin
+d none usr/share/man/man1 0755 root bin
 f none usr/share/man/man1/neon-config.1 0644 root bin
-d none usr/share/man/man3 755 root bin
+d none usr/share/man/man3 0755 root bin
 f none usr/share/man/man3/ne_add_request_header.3 0644 root bin
 f none usr/share/man/man3/ne_addr_destroy.3 0644 root bin
 f none usr/share/man/man3/ne_addr_error.3 0644 root bin
@@ -161,10 +154,14 @@
 f none usr/share/man/man3/ne_close_connection.3 0644 root bin
 f none usr/share/man/man3/ne_forget_auth.3 0644 root bin
 f none usr/share/man/man3/ne_get_error.3 0644 root bin
+f none usr/share/man/man3/ne_get_request_flag.3 0644 root bin
 f none usr/share/man/man3/ne_get_response_header.3 0644 root bin
 f none usr/share/man/man3/ne_get_scheme.3 0644 root bin
 f none usr/share/man/man3/ne_get_server_hostport.3 0644 root bin
+f none usr/share/man/man3/ne_get_session_flag.3 0644 root bin
 f none usr/share/man/man3/ne_get_status.3 0644 root bin
+f none usr/share/man/man3/ne_has_support.3 0644 root bin
+f none usr/share/man/man3/ne_i18n_init.3 0644 root bin
 f none usr/share/man/man3/ne_iaddr_cmp.3 0644 root bin
 f none usr/share/man/man3/ne_iaddr_free.3 0644 root bin
 f none usr/share/man/man3/ne_iaddr_make.3 0644 root bin
@@ -182,16 +179,19 @@
 f none usr/share/man/man3/ne_session_create.3 0644 root bin
 f none usr/share/man/man3/ne_session_destroy.3 0644 root bin
 f none usr/share/man/man3/ne_session_proxy.3 0644 root bin
+f none usr/share/man/man3/ne_set_connect_timeout.3 0644 root bin
 f none usr/share/man/man3/ne_set_error.3 0644 root bin
-f none usr/share/man/man3/ne_set_persist.3 0644 root bin
 f none usr/share/man/man3/ne_set_proxy_auth.3 0644 root bin
 f none usr/share/man/man3/ne_set_read_timeout.3 0644 root bin
 f none usr/share/man/man3/ne_set_request_body_buffer.3 0644 root bin
 f none usr/share/man/man3/ne_set_request_body_fd.3 0644 root bin
-f none usr/share/man/man3/ne_set_request_expect100.3 0644 root bin
+f none usr/share/man/man3/ne_set_request_body_fd64.3 0644 root bin
+f none usr/share/man/man3/ne_set_request_flag.3 0644 root bin
 f none usr/share/man/man3/ne_set_server_auth.3 0644 root bin
+f none usr/share/man/man3/ne_set_session_flag.3 0644 root bin
 f none usr/share/man/man3/ne_set_useragent.3 0644 root bin
 f none usr/share/man/man3/ne_shave.3 0644 root bin
+f none usr/share/man/man3/ne_sock_exit.3 0644 root bin
 f none usr/share/man/man3/ne_sock_init.3 0644 root bin
 f none usr/share/man/man3/ne_ssl_cert_cmp.3 0644 root bin
 f none usr/share/man/man3/ne_ssl_cert_export.3 0644 root bin
@@ -223,3 +223,32 @@
 f none usr/share/man/man3/ne_xml_create.3 0644 root bin
 f none usr/share/man/man3/ne_xml_destroy.3 0644 root bin
 f none usr/share/man/man3/neon.3 0644 root bin
+d none usr/share/locale 0755 root other
+d none usr/share/locale/cs 0755 root other
+d none usr/share/locale/cs/LC_MESSAGES 0755 root other
+d none usr/share/locale/de 0755 root other
+d none usr/share/locale/de/LC_MESSAGES 0755 root other
+d none usr/share/locale/fr 0755 root other
+d none usr/share/locale/fr/LC_MESSAGES 0755 root other
+d none usr/share/locale/ja 0755 root other
+d none usr/share/locale/ja/LC_MESSAGES 0755 root other
+d none usr/share/locale/nn 0755 root other
+d none usr/share/locale/nn/LC_MESSAGES 0755 root other
+d none usr/share/locale/pl 0755 root other
+d none usr/share/locale/pl/LC_MESSAGES 0755 root other
+d none usr/share/locale/ru 0755 root other
+d none usr/share/locale/ru/LC_MESSAGES 0755 root other
+d none usr/share/locale/tr 0755 root other
+d none usr/share/locale/tr/LC_MESSAGES 0755 root other
+d none usr/share/locale/zh_CN 0755 root other
+d none usr/share/locale/zh_CN/LC_MESSAGES 0755 root other
+f none usr/share/locale/cs/LC_MESSAGES/neon.mo 0644 root other
+f none usr/share/locale/de/LC_MESSAGES/neon.mo 0644 root other
+f none usr/share/locale/fr/LC_MESSAGES/neon.mo 0644 root other
+f none usr/share/locale/ja/LC_MESSAGES/neon.mo 0644 root other
+f none usr/share/locale/nn/LC_MESSAGES/neon.mo 0644 root other
+f none usr/share/locale/pl/LC_MESSAGES/neon.mo 0644 root other
+f none usr/share/locale/ru/LC_MESSAGES/neon.mo 0644 root other
+f none usr/share/locale/tr/LC_MESSAGES/neon.mo 0644 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/neon.mo 0644 root other
+
--- a/usr/src/pkgdefs/SUNWneon/prototype_i386	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWneon/prototype_i386	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_i386	1.1	07/02/24 SMI"
+#ident	"@(#)prototype_i386	1.2	09/09/24 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -42,7 +42,9 @@
 #
 # source locations relative to the prototype file
 #
-d none usr/lib/amd64 755 root bin
-s none usr/lib/amd64/libneon.so=libneon.so.25.0.5
-s none usr/lib/amd64/libneon.so.25=libneon.so.25.0.5
-f none usr/lib/amd64/libneon.so.25.0.5 0755 root bin
+d none usr/lib/amd64 0755 root bin
+d none usr/lib/amd64/pkgconfig 0755 root other
+s none usr/lib/amd64/libneon.so=libneon.so.27.2.0
+s none usr/lib/amd64/libneon.so.27=libneon.so.27.2.0
+f none usr/lib/amd64/libneon.so.27.2.0 0755 root bin
+f none usr/lib/amd64/pkgconfig/neon.pc 0444 root bin
--- a/usr/src/pkgdefs/SUNWneon/prototype_sparc	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWneon/prototype_sparc	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_sparc	1.1	07/02/24 SMI"
+#ident	"@(#)prototype_sparc	1.2	09/09/24 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -42,7 +42,9 @@
 #
 # source locations relative to the prototype file
 #
-d none usr/lib/sparcv9 755 root bin
-s none usr/lib/sparcv9/libneon.so=libneon.so.25.0.5
-s none usr/lib/sparcv9/libneon.so.25=libneon.so.25.0.5
-f none usr/lib/sparcv9/libneon.so.25.0.5 0755 root bin
+d none usr/lib/sparcv9 0755 root bin
+d none usr/lib/sparcv9/pkgconfig 0755 root other
+s none usr/lib/sparcv9/libneon.so=libneon.so.27.2.0
+s none usr/lib/sparcv9/libneon.so.27=libneon.so.27.2.0
+f none usr/lib/sparcv9/libneon.so.27.2.0 0755 root bin
+f none usr/lib/sparcv9/pkgconfig/neon.pc 0444 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140-include/Makefile	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"@(#)Makefile	1.1	09/11/05 SMI"
+
+include ../Makefile.com
+
+.KEEP_STATE:
+
+all: $(FILES)
+install: all pkg
+
+include ../Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140-include/copyright	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,126 @@
+  LICENSE ISSUES
+  ==============
+
+  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+  the OpenSSL License and the original SSLeay license apply to the toolkit.
+  See below for the actual license texts. Actually both licenses are BSD-style
+  Open Source licenses. In case of any license issues related to OpenSSL
+  please contact [email protected].
+
+  OpenSSL License
+  ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2008 The OpenSSL Project.  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. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    [email protected].
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``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 OpenSSL PROJECT 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 product includes cryptographic software written by Eric Young
+ * ([email protected]).  This product includes software written by Tim
+ * Hudson ([email protected]).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young ([email protected])
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young ([email protected]).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson ([email protected]).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young ([email protected])"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson ([email protected])"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140-include/depend	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,54 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"@(#)depend	1.1	09/11/05 SMI"
+
+#
+# This package information file defines software dependencies associated
+# with the pkg.  You can define three types of pkg dependencies with this file:
+#        P indicates a prerequisite for installation
+#        I indicates an incompatible package
+#        R indicates a reverse dependency
+# <pkg.abbr> see pkginfo(4), PKG parameter
+# <name> see pkginfo(4), NAME parameter
+# <version> see pkginfo(4), VERSION parameter
+# <arch> see pkginfo(4), ARCH parameter
+# <type> <pkg.abbr> <name>
+#       (<arch>)<version>
+#       (<arch>)<version>
+#       ...
+# <type> <pkg.abbr> <name>
+# ...
+
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWhea		SunOS Header Files
+P SUNWopenssl-include	OpenSSL Header Files
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140-include/pkginfo.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,59 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)pkginfo.tmpl	1.1	09/11/05 SMI"
+#
+
+#
+# This required package information file describes characteristics of the
+# package, such as package abbreviation, full package name, package version,
+# and package architecture.
+#
+PKG="SUNWopenssl-fips-140-include"
+NAME="FIPS 140-2 Capable OpenSSL Header Files"
+ARCH="ISA"
+VERSION="SFWVERS,REV=0.0.0"
+SUNW_PRODNAME="SunOS"
+SUNW_PRODVERS="RELEASE/VERSION"
+SUNW_PKGTYPE="usr"
+MAXINST="1000"
+CATEGORY="system"
+DESC="FIPS Capable OpenSSL C/C++ header files for development of OpenSSL applications (0.9.8k)"
+VENDOR="Sun Microsystems, Inc."
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+CLASSES="none"
+BASEDIR=/
+SUNW_PKGVERS="1.0"
+SUNW_PKG_ALLZONES="true"
+SUNW_PKG_HOLLOW="false"
+SUNW_PKG_THISZONE="false"
+#VSTOCK="<reserved by Release Engineering for package part #>"
+#ISTATES="<developer defined>"
+#RSTATES='<developer defined>'
+#ULIMIT="<developer defined>"
+#ORDER="<developer defined>"
+#PSTAMP="<developer defined>"
+#INTONLY="<developer defined>"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140-include/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,47 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)prototype_com	1.1	09/11/05 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+d none usr 755 root sys
+d none usr/include 755 root bin
+d none usr/include/openssl 755 root bin
+d none usr/include/openssl/fips-140 755 root bin
+d none usr/include/openssl/fips-140/openssl 755 root bin
+f none usr/include/openssl/fips-140/openssl/fips.h 444 root bin
+f none usr/include/openssl/fips-140/openssl/fips_rand.h 444 root bin
+f none usr/include/openssl/fips-140/openssl/opensslconf.h 444 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140-include/prototype_i386	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,39 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)prototype_i386	1.1	09/11/05 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140-include/prototype_sparc	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,39 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)prototype_sparc	1.1	09/11/05 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140/Makefile	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# ident	"@(#)Makefile	1.1	09/11/05 SMI"
+
+include ../Makefile.com
+
+DATAFILES = depend
+
+.KEEP_STATE:
+
+all: $(FILES)
+install: all pkg
+
+include ../Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140/copyright	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,132 @@
+Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+Use is subject to license terms.
+
+--------------------------------------------------------------------
+
+
+  LICENSE ISSUES
+  ==============
+
+  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+  the OpenSSL License and the original SSLeay license apply to the toolkit.
+  See below for the actual license texts. Actually both licenses are BSD-style
+  Open Source licenses. In case of any license issues related to OpenSSL
+  please contact [email protected].
+
+  OpenSSL License
+  ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2008 The OpenSSL Project.  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. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    [email protected].
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``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 OpenSSL PROJECT 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 product includes cryptographic software written by Eric Young
+ * ([email protected]).  This product includes software written by Tim
+ * Hudson ([email protected]).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young ([email protected])
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young ([email protected]).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson ([email protected]).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young ([email protected])"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson ([email protected])"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140/pkginfo.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,59 @@
+
+CDDL HEADER START
+
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)pkginfo.tmpl	1.1	09/11/05 SMI"
+#
+
+#
+# This required package information file describes characteristics of the
+# package, such as package abbreviation, full package name, package version,
+# and package architecture.
+#
+PKG="SUNWopenssl-fips-140"
+NAME="FIPS 140-2 Capable OpenSSL libraries"
+ARCH="ISA"
+VERSION="SFWVERS,REV=0.0.0"
+SUNW_PRODNAME="SunOS"
+SUNW_PRODVERS="RELEASE/VERSION"
+SUNW_PKGTYPE="root"
+MAXINST="1000"
+CATEGORY="system"
+DESC="FIPS 140-2 Capable OpenSSL libraries (0.9.8k) (Root)"
+VENDOR="Sun Microsystems, Inc."
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+CLASSES="none"
+BASEDIR=/
+SUNW_PKGVERS="1.0"
+SUNW_PKG_ALLZONES="true"
+SUNW_PKG_HOLLOW="false"
+SUNW_PKG_THISZONE="false"
+#VSTOCK="<reserved by Release Engineering for package part #>"
+#ISTATES="<developer defined>"
+#RSTATES='<developer defined>'
+#ULIMIT="<developer defined>"
+#ORDER="<developer defined>"
+#PSTAMP="<developer defined>"
+#INTONLY="<developer defined>"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,44 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)prototype_com	1.1	09/11/05 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+d none lib 755 root bin
+d none lib/openssl 755 root bin
+d none lib/openssl/fips-140 755 root bin
+f none lib/openssl/fips-140/libcrypto.so.0.9.8 755 root bin
+s none lib/openssl/fips-140/libcrypto.so=libcrypto.so.0.9.8
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140/prototype_i386	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)prototype_i386	1.1	09/11/05 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are i386 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWopenssl-libraries
+#
+#
+d none lib/openssl/fips-140/amd64 755 root bin
+f none lib/openssl/fips-140/amd64/libcrypto.so.0.9.8 755 root bin
+s none lib/openssl/fips-140/amd64/libcrypto.so=libcrypto.so.0.9.8
+s none lib/openssl/fips-140/64=amd64
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140/prototype_sparc	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)prototype_sparc	1.1	09/11/05 SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are SPARC specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWopenssl-libraries
+#
+#
+d none lib/openssl/fips-140/sparcv9 755 root bin
+f none lib/openssl/fips-140/sparcv9/libcrypto.so.0.9.8 755 root bin
+s none lib/openssl/fips-140/sparcv9/libcrypto.so=libcrypto.so.0.9.8
+s none lib/openssl/fips-140/64=sparcv9
--- a/usr/src/pkgdefs/SUNWphp52r/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWphp52r/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)prototype_com	1.6	09/03/01 SMI"
+#pragma ident	"@(#)prototype_com	1.7	09/10/29 SMI"
 
 # SUNWphp52r
 #
@@ -56,6 +56,7 @@
 e renamenew etc/php/5.2/conf.d/openssl.ini 0644 root bin
 e renamenew etc/php/5.2/conf.d/pdo.ini 0644 root bin
 e renamenew etc/php/5.2/conf.d/pdo_sqlite.ini 0644 root bin
+e renamenew etc/php/5.2/conf.d/snmp.ini 0644 root bin
 e renamenew etc/php/5.2/conf.d/sqlite.ini 0644 root bin
 e renamenew etc/php/5.2/conf.d/suhosin.ini 0644 root bin
 e renamenew etc/php/5.2/conf.d/tcpwrap.ini 0644 root bin
--- a/usr/src/pkgdefs/SUNWphp52u/depend	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWphp52u/depend	Sun Dec 20 07:12:51 2009 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)depend	1.9	09/03/02 SMI"
+#pragma ident	"@(#)depend	1.10	09/10/29 SMI"
 
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -80,3 +80,4 @@
 P SUNWgsed	GNU implementation of sed, the Unix stream editor
 P SUNWltdl	GNU libtool dlopen wrapper
 P SUNWbash	GNU Bourne-Again shell (bash)
+P SUNWnet-snmp-core	Net-SNMP Agent files and libraries
--- a/usr/src/pkgdefs/SUNWphp52u/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWphp52u/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)prototype_com	1.9	09/09/30 SMI"
+#pragma ident	"@(#)prototype_com	1.10	09/10/29 SMI"
 
 # SUNWphp52u
 #
@@ -362,6 +362,7 @@
 f none usr/php/5.2/modules/openssl.so 0555 root bin
 f none usr/php/5.2/modules/pdo.so 0555 root bin
 f none usr/php/5.2/modules/pdo_sqlite.so 0555 root bin
+f none usr/php/5.2/modules/snmp.so 0555 root bin
 f none usr/php/5.2/modules/sqlite.so 0555 root bin
 f none usr/php/5.2/modules/suhosin.so 0555 root bin
 f none usr/php/5.2/modules/tcpwrap.so 0555 root bin
--- a/usr/src/pkgdefs/SUNWsvn-python/depend	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWsvn-python/depend	Sun Dec 20 07:12:51 2009 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -22,7 +22,7 @@
 # CDDL HEADER END
 #
 #
-#ident	"@(#)depend	1.5	08/09/29 SMI"
+#ident	"@(#)depend	1.6	09/10/28 SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -53,4 +53,5 @@
 P SUNWapu13lib	Apache Portable Runtime Utility (APR-util) 1.3 Shared Libraries
 P SUNWsvn	Subversion
 P SUNWPython	The Python interpreter, libraries and utilities
+P SUNWPython26	The Python interpreter, libraries and utilities
 P SUNWsqlite3	SQLite3 
--- a/usr/src/pkgdefs/SUNWsvn-python/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWsvn-python/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.1	07/02/24 SMI"
+# ident	"@(#)prototype_com	1.2	09/09/30 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -47,47 +47,100 @@
 d none usr/lib/python2.4 0755 root bin
 d none usr/lib/python2.4/vendor-packages 0755 root bin
 d none usr/lib/python2.4/vendor-packages/libsvn 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/client.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/client.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/delta.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/fs.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_wc.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/fs.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/__init__.pyc 0644 root bin
+d none usr/lib/python2.4/vendor-packages/svn 0755 root bin
+d none usr/lib/python2.6 0755 root bin
+d none usr/lib/python2.6/vendor-packages 0755 root bin
+d none usr/lib/python2.6/vendor-packages/libsvn 0755 root bin
+d none usr/lib/python2.6/vendor-packages/svn 0755 root bin
+d none usr/lib/svn 0755 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/_client.so 0755 root bin
 f none usr/lib/python2.4/vendor-packages/libsvn/_core.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/core.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/ra.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/delta.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/_delta.so 0755 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/_diff.so 0755 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/_fs.so 0755 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/_ra.so 0755 root bin
 f none usr/lib/python2.4/vendor-packages/libsvn/_repos.so 0755 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/_wc.so 0755 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/client.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/client.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/core.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/core.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/delta.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/delta.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/diff.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/diff.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/fs.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/fs.pyc 0644 root bin
 f none usr/lib/python2.4/vendor-packages/libsvn/ra.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_fs.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/__init__.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/core.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/ra.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/repos.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/repos.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/wc.py 0644 root bin
 f none usr/lib/python2.4/vendor-packages/libsvn/wc.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_client.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_ra.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_delta.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/repos.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/repos.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/wc.py 0644 root bin
-d none usr/lib/python2.4/vendor-packages/svn 0755 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/__init__.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/libsvn/__init__.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/client.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/client.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/core.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/core.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/delta.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/delta.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/diff.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/diff.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/fs.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/fs.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/ra.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/ra.pyc 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/repos.py 0644 root bin
+f none usr/lib/python2.4/vendor-packages/svn/repos.pyc 0644 root bin
 f none usr/lib/python2.4/vendor-packages/svn/wc.py 0644 root bin
 f none usr/lib/python2.4/vendor-packages/svn/wc.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/core.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/repos.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/delta.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/core.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/ra.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/fs.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/repos.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/delta.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/fs.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/client.py 0644 root bin
 f none usr/lib/python2.4/vendor-packages/svn/__init__.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/ra.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/client.pyc 0644 root bin
 f none usr/lib/python2.4/vendor-packages/svn/__init__.pyc 0644 root bin
-d none usr/lib/svn 0755 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/_client.so 0755 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/_core.so 0755 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/_delta.so 0755 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/_diff.so 0755 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/_fs.so 0755 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/_ra.so 0755 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/_repos.so 0755 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/_wc.so 0755 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/client.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/client.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/core.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/core.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/delta.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/delta.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/diff.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/diff.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/fs.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/fs.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/ra.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/ra.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/repos.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/repos.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/wc.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/wc.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/__init__.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/libsvn/__init__.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/client.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/client.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/core.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/core.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/delta.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/delta.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/diff.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/diff.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/fs.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/fs.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/ra.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/ra.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/repos.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/repos.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/wc.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/wc.pyc 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/__init__.py 0644 root bin
+f none usr/lib/python2.6/vendor-packages/svn/__init__.pyc 0644 root bin
+f none usr/lib/svn/libsvn_swig_py-1.so.0.0.0 0755 root bin
+s none usr/lib/svn/libsvn_swig_py-1.so.0=libsvn_swig_py-1.so.0.0.0
 s none usr/lib/svn/libsvn_swig_py-1.so=libsvn_swig_py-1.so.0.0.0
-s none usr/lib/svn/libsvn_swig_py-1.so.0=libsvn_swig_py-1.so.0.0.0
-f none usr/lib/svn/libsvn_swig_py-1.so.0.0.0 0755 root bin
--- a/usr/src/pkgdefs/SUNWsvn/pkginfo.tmpl	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWsvn/pkginfo.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.2	07/03/29 SMI"
+#ident	"@(#)pkginfo.tmpl	1.3	09/09/24 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -37,7 +37,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="The Subversion Source Control Management System (1.4.3)"
+DESC="The Subversion Source Control Management System (1.6.5)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWsvn/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWsvn/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.5	09/09/21 SMI"
+#ident	"@(#)prototype_com	1.6	09/09/24 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -43,9 +43,9 @@
 # SUNWsvn
 #
 d none usr 0755 root sys
-d none usr/apache2 755 root bin
-d none usr/apache2/2.2 755 root bin
-d none usr/apache2/2.2/libexec 755 root bin
+d none usr/apache2 0755 root bin
+d none usr/apache2/2.2 0755 root bin
+d none usr/apache2/2.2/libexec 0755 root bin
 f none usr/apache2/2.2/libexec/mod_authz_svn.so 0555 root bin
 f none usr/apache2/2.2/libexec/mod_dav_svn.so 0555 root bin
 d none usr/bin 0755 root bin
@@ -56,25 +56,31 @@
 f none usr/bin/svnserve 0755 root bin
 f none usr/bin/svnsync 0755 root bin
 f none usr/bin/svnversion 0755 root bin
-d none usr/include 755 root bin
-d none usr/include/svn 755 root bin
+d none usr/include 0755 root bin
+d none usr/include/svn 0755 root bin
+f none usr/include/svn/mod_authz_svn.h 0644 root bin
 f none usr/include/svn/mod_dav_svn.h 0644 root bin
 f none usr/include/svn/svn_auth.h 0644 root bin
 f none usr/include/svn/svn_base64.h 0644 root bin
+f none usr/include/svn/svn_checksum.h 0644 root bin
 f none usr/include/svn/svn_client.h 0644 root bin
 f none usr/include/svn/svn_cmdline.h 0644 root bin
+f none usr/include/svn/svn_compat.h 0644 root bin
 f none usr/include/svn/svn_config.h 0644 root bin
 f none usr/include/svn/svn_ctype.h 0644 root bin
 f none usr/include/svn/svn_dav.h 0644 root bin
 f none usr/include/svn/svn_delta.h 0644 root bin
 f none usr/include/svn/svn_diff.h 0644 root bin
+f none usr/include/svn/svn_dirent_uri.h 0644 root bin
 f none usr/include/svn/svn_dso.h 0644 root bin
 f none usr/include/svn/svn_error.h 0644 root bin
 f none usr/include/svn/svn_error_codes.h 0644 root bin
 f none usr/include/svn/svn_fs.h 0644 root bin
 f none usr/include/svn/svn_hash.h 0644 root bin
 f none usr/include/svn/svn_io.h 0644 root bin
+f none usr/include/svn/svn_iter.h 0644 root bin
 f none usr/include/svn/svn_md5.h 0644 root bin
+f none usr/include/svn/svn_mergeinfo.h 0644 root bin
 f none usr/include/svn/svn_nls.h 0644 root bin
 f none usr/include/svn/svn_opt.h 0644 root bin
 f none usr/include/svn/svn_path.h 0644 root bin
@@ -94,8 +100,8 @@
 f none usr/include/svn/svn_version.h 0644 root bin
 f none usr/include/svn/svn_wc.h 0644 root bin
 f none usr/include/svn/svn_xml.h 0644 root bin
-d none usr/lib 755 root bin
-d none usr/lib/svn 755 root bin
+d none usr/lib 0755 root bin
+d none usr/lib/svn 0755 root bin
 f none usr/lib/svn/libsvn_client-1.so.0.0.0 0755 root bin
 s none usr/lib/svn/libsvn_client-1.so.0=libsvn_client-1.so.0.0.0
 s none usr/lib/svn/libsvn_client-1.so=libsvn_client-1.so.0.0.0
@@ -111,15 +117,18 @@
 f none usr/lib/svn/libsvn_fs_fs-1.so.0.0.0 0755 root bin
 s none usr/lib/svn/libsvn_fs_fs-1.so.0=libsvn_fs_fs-1.so.0.0.0
 s none usr/lib/svn/libsvn_fs_fs-1.so=libsvn_fs_fs-1.so.0.0.0
+f none usr/lib/svn/libsvn_fs_util-1.so.0.0.0 0755 root bin
+s none usr/lib/svn/libsvn_fs_util-1.so.0=libsvn_fs_util-1.so.0.0.0
+s none usr/lib/svn/libsvn_fs_util-1.so=libsvn_fs_util-1.so.0.0.0
 f none usr/lib/svn/libsvn_ra-1.so.0.0.0 0755 root bin
 s none usr/lib/svn/libsvn_ra-1.so.0=libsvn_ra-1.so.0.0.0
 s none usr/lib/svn/libsvn_ra-1.so=libsvn_ra-1.so.0.0.0
-f none usr/lib/svn/libsvn_ra_dav-1.so.0.0.0 0755 root bin
-s none usr/lib/svn/libsvn_ra_dav-1.so.0=libsvn_ra_dav-1.so.0.0.0
-s none usr/lib/svn/libsvn_ra_dav-1.so=libsvn_ra_dav-1.so.0.0.0
 f none usr/lib/svn/libsvn_ra_local-1.so.0.0.0 0755 root bin
 s none usr/lib/svn/libsvn_ra_local-1.so.0=libsvn_ra_local-1.so.0.0.0
 s none usr/lib/svn/libsvn_ra_local-1.so=libsvn_ra_local-1.so.0.0.0
+f none usr/lib/svn/libsvn_ra_neon-1.so.0.0.0 0755 root bin
+s none usr/lib/svn/libsvn_ra_neon-1.so.0=libsvn_ra_neon-1.so.0.0.0
+s none usr/lib/svn/libsvn_ra_neon-1.so=libsvn_ra_neon-1.so.0.0.0
 f none usr/lib/svn/libsvn_ra_svn-1.so.0.0.0 0755 root bin
 s none usr/lib/svn/libsvn_ra_svn-1.so.0=libsvn_ra_svn-1.so.0.0.0
 s none usr/lib/svn/libsvn_ra_svn-1.so=libsvn_ra_svn-1.so.0.0.0
@@ -132,53 +141,53 @@
 f none usr/lib/svn/libsvn_wc-1.so.0.0.0 0755 root bin
 s none usr/lib/svn/libsvn_wc-1.so.0=libsvn_wc-1.so.0.0.0
 s none usr/lib/svn/libsvn_wc-1.so=libsvn_wc-1.so.0.0.0
-d none usr/share 755 root sys
-d none usr/share/locale 755 root other
-d none usr/share/locale/de 755 root other
-d none usr/share/locale/de/LC_MESSAGES 755 root other
-f none usr/share/locale/de/LC_MESSAGES/subversion.mo 644 root other
-d none usr/share/locale/es 755 root other
-d none usr/share/locale/es/LC_MESSAGES 755 root other
-f none usr/share/locale/es/LC_MESSAGES/subversion.mo 644 root other
-d none usr/share/locale/fr 755 root other
-d none usr/share/locale/fr/LC_MESSAGES 755 root other
-f none usr/share/locale/fr/LC_MESSAGES/subversion.mo 644 root other
-d none usr/share/locale/it 755 root other
-d none usr/share/locale/it/LC_MESSAGES 755 root other
-f none usr/share/locale/it/LC_MESSAGES/subversion.mo 644 root other
-d none usr/share/locale/ja 755 root other
-d none usr/share/locale/ja/LC_MESSAGES 755 root other
-f none usr/share/locale/ja/LC_MESSAGES/subversion.mo 644 root other
-d none usr/share/locale/ko 755 root other
-d none usr/share/locale/ko/LC_MESSAGES 755 root other
-f none usr/share/locale/ko/LC_MESSAGES/subversion.mo 644 root other
-d none usr/share/locale/nb 755 root other
-d none usr/share/locale/nb/LC_MESSAGES 755 root other
-f none usr/share/locale/nb/LC_MESSAGES/subversion.mo 644 root other
-d none usr/share/locale/pl 755 root other
-d none usr/share/locale/pl/LC_MESSAGES 755 root other
-f none usr/share/locale/pl/LC_MESSAGES/subversion.mo 644 root other
-d none usr/share/locale/pt_BR 755 root other
-d none usr/share/locale/pt_BR/LC_MESSAGES 755 root other
-f none usr/share/locale/pt_BR/LC_MESSAGES/subversion.mo 644 root other
-d none usr/share/locale/sv 755 root other
-d none usr/share/locale/sv/LC_MESSAGES 755 root other
-f none usr/share/locale/sv/LC_MESSAGES/subversion.mo 644 root other
-d none usr/share/locale/zh_CN 755 root other
-d none usr/share/locale/zh_CN/LC_MESSAGES 755 root other
-f none usr/share/locale/zh_CN/LC_MESSAGES/subversion.mo 644 root other
-d none usr/share/locale/zh_TW 755 root other
-d none usr/share/locale/zh_TW/LC_MESSAGES 755 root other
-f none usr/share/locale/zh_TW/LC_MESSAGES/subversion.mo 644 root other
-d none usr/share/man 755 root bin
-d none usr/share/man/man1 755 root bin
+d none usr/share 0755 root sys
+d none usr/share/locale 0755 root other
+d none usr/share/locale/de 0755 root other
+d none usr/share/locale/de/LC_MESSAGES 0755 root other
+f none usr/share/locale/de/LC_MESSAGES/subversion.mo 0644 root other
+d none usr/share/locale/es 0755 root other
+d none usr/share/locale/es/LC_MESSAGES 0755 root other
+f none usr/share/locale/es/LC_MESSAGES/subversion.mo 0644 root other
+d none usr/share/locale/fr 0755 root other
+d none usr/share/locale/fr/LC_MESSAGES 0755 root other
+f none usr/share/locale/fr/LC_MESSAGES/subversion.mo 0644 root other
+d none usr/share/locale/it 0755 root other
+d none usr/share/locale/it/LC_MESSAGES 0755 root other
+f none usr/share/locale/it/LC_MESSAGES/subversion.mo 0644 root other
+d none usr/share/locale/ja 0755 root other
+d none usr/share/locale/ja/LC_MESSAGES 0755 root other
+f none usr/share/locale/ja/LC_MESSAGES/subversion.mo 0644 root other
+d none usr/share/locale/ko 0755 root other
+d none usr/share/locale/ko/LC_MESSAGES 0755 root other
+f none usr/share/locale/ko/LC_MESSAGES/subversion.mo 0644 root other
+d none usr/share/locale/nb 0755 root other
+d none usr/share/locale/nb/LC_MESSAGES 0755 root other
+f none usr/share/locale/nb/LC_MESSAGES/subversion.mo 0644 root other
+d none usr/share/locale/pl 0755 root other
+d none usr/share/locale/pl/LC_MESSAGES 0755 root other
+f none usr/share/locale/pl/LC_MESSAGES/subversion.mo 0644 root other
+d none usr/share/locale/pt_BR 0755 root other
+d none usr/share/locale/pt_BR/LC_MESSAGES 0755 root other
+f none usr/share/locale/pt_BR/LC_MESSAGES/subversion.mo 0644 root other
+d none usr/share/locale/sv 0755 root other
+d none usr/share/locale/sv/LC_MESSAGES 0755 root other
+f none usr/share/locale/sv/LC_MESSAGES/subversion.mo 0644 root other
+d none usr/share/locale/zh_CN 0755 root other
+d none usr/share/locale/zh_CN/LC_MESSAGES 0755 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/subversion.mo 0644 root other
+d none usr/share/locale/zh_TW 0755 root other
+d none usr/share/locale/zh_TW/LC_MESSAGES 0755 root other
+f none usr/share/locale/zh_TW/LC_MESSAGES/subversion.mo 0644 root other
+d none usr/share/man 0755 root bin
+d none usr/share/man/man1 0755 root bin
 f none usr/share/man/man1/svn.1 0444 root bin
 f none usr/share/man/man1/svnadmin.1 0444 root bin
 f none usr/share/man/man1/svndumpfilter.1 0444 root bin
 f none usr/share/man/man1/svnlook.1 0444 root bin
 f none usr/share/man/man1/svnsync.1 0444 root bin
 f none usr/share/man/man1/svnversion.1 0444 root bin
-d none usr/share/man/man5 755 root bin
+d none usr/share/man/man5 0755 root bin
 f none usr/share/man/man5/svnserve.conf.5 0444 root bin
-d none usr/share/man/man8 755 root bin
+d none usr/share/man/man8 0755 root bin
 f none usr/share/man/man8/svnserve.8 0444 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtcat-examples/Makefile	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"@(#)Makefile	1.1	09/10/30 SMI"
+#
+
+include ../Makefile.com
+
+DATAFILES= 
+
+.KEEP_STATE:
+
+all: $(FILES)
+install: all pkg
+
+include ../Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtcat-examples/copyright	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,425 @@
+
+                                 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.
+
+
+
+APACHE TOMCAT SUBCOMPONENTS: 
+
+Apache Tomcat includes a number of subcomponents with separate copyright notices
+and license terms. Your use of these subcomponents is subject to the terms and
+conditions of the following licenses. 
+
+
+For the jasper-jdt.jar component:
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and such
+derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
+Patents to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form.
+This patent license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the
+Licensed Patents. The patent license shall not apply to any other combinations
+which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to
+its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other intellectual
+property rights of any other entity. Each Contributor disclaims any liability to
+Recipient 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, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights needed, if any.
+For example, if a third party patent license is required to allow Recipient to
+distribute the Program, it is Recipient's responsibility to acquire that license
+before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its
+own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title and
+non-infringement, and implied warranties or conditions of merchantability and
+fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by
+that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor,
+and informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each
+Recipient is solely responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its exercise of
+rights under this Agreement , including but not limited to the risks and costs
+of program errors, compliance with applicable laws, damage to or loss of data,
+programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted under
+Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue and
+survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation
+may assign the responsibility to serve as the Agreement Steward to a suitable
+separate entity. Each new version of the Agreement will be given a
+distinguishing version number. The Program (including Contributions) may always
+be distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to distribute the Program (including its Contributions)
+under the new version. Except as expressly stated in Sections 2(a) and 2(b)
+above, Recipient receives no rights or licenses to the intellectual property of
+any Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted under
+this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtcat-examples/depend	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,59 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"@(#)depend	1.1	09/10/30 SMI"
+#
+
+#
+# This package information file defines software dependencies associated
+# with the pkg.  You can define three types of pkg dependencies with this file:
+#	 P indicates a prerequisite for installation
+#	 I indicates an incompatible package
+#	 R indicates a reverse dependency
+# <pkg.abbr> see pkginfo(4), PKG parameter
+# <name> see pkginfo(4), NAME parameter
+# <version> see pkginfo(4), VERSION parameter
+# <arch> see pkginfo(4), ARCH parameter
+# <type> <pkg.abbr> <name>
+# 	(<arch>)<version>
+# 	(<arch>)<version>
+# 	...
+# <type> <pkg.abbr> <name>
+# ...
+#
+
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWkrbu	Kerberos version 5 support (Usr)
+P SUNWpcre	Perl-Compatible Regular Expressions
+P SUNWzlib	The Zip compression li
+P SUNWtcatr	Tomcat Servlet/JSP Container (root)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtcat-examples/pkginfo.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,59 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"@(#)pkginfo.tmpl	1.2	09/11/03 SMI"
+#
+
+#
+# This required package information file describes characteristics of the
+# package, such as package abbreviation, full package name, package version,
+# and package architecture.
+#
+PKG="SUNWtcat-examples"
+NAME="Tomcat Servlet/JSP Container - example applications"
+ARCH="ISA"
+VERSION="SFWVERS,REV=0.0.0"
+SUNW_PRODNAME="SunOS"
+SUNW_PRODVERS="RELEASE/VERSION"
+SUNW_PKGTYPE="root"
+MAXINST="1000"
+CATEGORY="system"
+DESC="Tomcat Servlet/JSP Container - example applications"
+VENDOR="Sun Microsystems, Inc."
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+CLASSES="none"
+BASEDIR=/
+SUNW_PKGVERS="1.0"
+SUNW_PKG_ALLZONES="false"
+SUNW_PKG_HOLLOW="false"
+SUNW_PKG_THISZONE="false"
+#VSTOCK="<reserved by Release Engineering for package part #>"
+#ISTATES="<developer defined>"
+#RSTATES='<developer defined>'
+#ULIMIT="<developer defined>"
+#ORDER="<developer defined>"
+#PSTAMP="<developer defined>"
+#INTONLY="<developer defined>"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtcat-examples/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,401 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"@(#)prototype_com	1.1	09/10/30 SMI"
+#
+
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+#
+# source locations relative to the prototype file
+#
+# SUNWtcat-examples
+#
+d none var 755 root sys
+d none var/tomcat6 0755 root bin
+d none var/tomcat6/webapps 0755 webservd webservd
+s none var/tomcat6/webapps/docs=../../../usr/tomcat6/docs
+d none var/tomcat6/webapps/examples 0755 root bin
+d none var/tomcat6/webapps/examples/jsp 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/source.jsp.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/num 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/num/numguess.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/num/numguess.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/num/numguess.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/forward 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/forward/forward.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/forward/forward.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/forward/one.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/forward/fwd.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/forward/two.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/forward/one.jsp.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/chat 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/chat/chat.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/chat/login.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/chat/post.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/chat/chat.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/chat/login.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/chat/post.jsp.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/images 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/images/read.gif 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/images/return.gif 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/images/code.gif 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/images/execute.gif 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/dates 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/dates/date.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/dates/date.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/dates/date.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/sessions 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/sessions/DummyCart.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/sessions/crt.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/sessions/carts.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/sessions/carts.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/sessions/carts.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/index.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/jsptoserv 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/jsptoserv/jts.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsptoserv/hello.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsptoserv/hello.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsptoserv/servletToJsp.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/checkbox 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/checkbox/CheckTest.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/checkbox/checkresult.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/checkbox/check.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/checkbox/cresult.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/checkbox/checkresult.jsp.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/plugin 0755 root bin
+d none var/tomcat6/webapps/examples/jsp/plugin/applet 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/plugin/applet/Clock2.class 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/plugin/applet/Clock2.java 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/plugin/plugin.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/plugin/plugin.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/plugin/plugin.jsp 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/simpletag 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/simpletag/foo.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/simpletag/foo.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/simpletag/foo.jsp 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/tagplugin 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/tagplugin/foreach.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/tagplugin/howto.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/tagplugin/choose.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/tagplugin/if.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/tagplugin/notes.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/tagplugin/foreach.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/tagplugin/choose.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/tagplugin/choose.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/tagplugin/foreach.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/tagplugin/if.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/tagplugin/if.jsp.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/cal 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/cal/cal2.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/cal/calendar.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/cal/cal2.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/cal/Entry.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/cal/TableBean.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/cal/cal1.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/cal/JspCalendar.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/cal/Entries.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/cal/login.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/cal/cal1.jsp 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/jsp2 0755 root bin
+d none var/tomcat6/webapps/examples/jsp/jsp2/jspx 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.jspx 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/svgexample.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jspx.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jpg 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jspx 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.jspx.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/displayProducts.tag.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.tag.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/xhtmlbasic.tag.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/helloWorld.tag.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/jsp2/simpletag 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/BookBean.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/FindBookSimpleTag.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/Functions.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/RepeatSimpleTag.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/HelloWorldSimpleTag.java.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/TileSimpleTag.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/HelloWorldSimpleTag.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/ShuffleSimpleTag.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/FooBean.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/jsp2/el 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/Functions.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/functions.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/functions.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/functions.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.jsp 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/jsp2/misc 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/misc/config.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/misc/config.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/misc/prelude.jspf.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/misc/coda.jspf 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/misc/EchoAttributesTag.java.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/misc/prelude.jspf 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/misc/coda.jspf.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/misc/config.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/snp 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/snp/snoop.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/snp/snoop.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/snp/snoop.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/source.jsp 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/error 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/error/error.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/error/errorpge.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/error/er.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/error/errorpge.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/error/err.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/error/err.jsp 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/xml 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/xml/xml.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/xml/xml.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/xml/xml.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/colors 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/colors/colrs.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/colors/colors.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/colors/clr.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/colors/colrs.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/colors/ColorGameBean.html 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/include 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/include/foo.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/include/foo.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/include/inc.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/include/foo.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/include/include.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/include/include.jsp 0644 root bin
+d none var/tomcat6/webapps/examples/jsp/security 0755 root bin
+d none var/tomcat6/webapps/examples/jsp/security/protected 0755 root bin
+f none var/tomcat6/webapps/examples/jsp/security/protected/error.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/security/protected/index.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/security/protected/login.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/security/protected/error.jsp 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/security/protected/index.jsp.html 0644 root bin
+f none var/tomcat6/webapps/examples/jsp/security/protected/login.jsp.html 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF 0755 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/tags 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/tags/helloWorld.tag 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/tags/panel.tag 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/tags/displayProducts.tag 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/tags/xhtmlbasic.tag 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/lib 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/lib/standard.jar 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/lib/jstl.jar 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/jsp2 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes 0755 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/error 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/error/Smart.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/error/Smart.java 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/SessionExample.class 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/checkbox 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/filters 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings.properties 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.java 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/chat 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet$MessageSender.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/servletToJsp.class 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/cal 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/TableBean.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entry.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entries.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/JspCalendar.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entries.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/TableBean.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/JspCalendar.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entry.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.java 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/validators 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.class 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/listeners 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/util 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/util/HTMLFilter.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/util/HTMLFilter.class 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/num 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.class 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/examples 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTag.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/LogTag.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/LogTag.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTag.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/CookieExample.java 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/colors 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/CookieExample.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.class 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/dates 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/dates/JspCalendar.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/dates/JspCalendar.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/SessionExample.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_en.properties 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2 0755 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples 0755 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/classes/sessions 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.class 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/servletToJsp.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_es.properties 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/jsp 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/jsp/example-taglib.tld 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/jsp/debug-taglib.tld 0644 root bin
+d none var/tomcat6/webapps/examples/WEB-INF/jsp/applet 0755 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/jsp/applet/Clock2.java 0644 root bin
+f none var/tomcat6/webapps/examples/WEB-INF/web.xml 0644 root bin
+d none var/tomcat6/webapps/examples/servlets 0755 root bin
+f none var/tomcat6/webapps/examples/servlets/reqheaders.html 0644 root bin
+f none var/tomcat6/webapps/examples/servlets/helloworld.html 0644 root bin
+f none var/tomcat6/webapps/examples/servlets/reqparams.html 0644 root bin
+f none var/tomcat6/webapps/examples/servlets/index.html 0644 root bin
+d none var/tomcat6/webapps/examples/servlets/images 0755 root bin
+f none var/tomcat6/webapps/examples/servlets/images/return.gif 0644 root bin
+f none var/tomcat6/webapps/examples/servlets/images/code.gif 0644 root bin
+f none var/tomcat6/webapps/examples/servlets/images/execute.gif 0644 root bin
+f none var/tomcat6/webapps/examples/servlets/reqinfo.html 0644 root bin
+f none var/tomcat6/webapps/examples/servlets/sessions.html 0644 root bin
+f none var/tomcat6/webapps/examples/servlets/cookies.html 0644 root bin
+f none var/tomcat6/webapps/examples/index.html 0644 root bin
+d none var/tomcat6/webapps/ROOT.example 0755 root bin
+f none var/tomcat6/webapps/ROOT.example/RELEASE-NOTES.txt 0644 root bin
+f none var/tomcat6/webapps/ROOT.example/tomcat.svg 0644 root bin
+d none var/tomcat6/webapps/ROOT.example/WEB-INF 0755 root bin
+f none var/tomcat6/webapps/ROOT.example/WEB-INF/web.xml 0644 root bin
+f none var/tomcat6/webapps/ROOT.example/tomcat-power.gif 0644 root bin
+f none var/tomcat6/webapps/ROOT.example/asf-logo-wide.gif 0644 root bin
+f none var/tomcat6/webapps/ROOT.example/index.html 0644 root bin
+f none var/tomcat6/webapps/ROOT.example/tomcat.gif 0644 root bin
+f none var/tomcat6/webapps/ROOT.example/favicon.ico 0644 root bin
+f none var/tomcat6/webapps/ROOT.example/build.xml 0644 root bin
+f none var/tomcat6/webapps/ROOT.example/index.jsp 0644 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtcat-examples/prototype_i386	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)prototype_i386	1.1	09/11/02 SMI"
+#
+
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are i386 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWtcat-examples
+#
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWtcat-examples/prototype_sparc	Sun Dec 20 07:12:51 2009 +0200
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"@(#)prototype_sparc	1.1	09/11/02 SMI"
+#
+
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are SPARC specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWtcat-examples
+#
--- a/usr/src/pkgdefs/SUNWtcatr/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWtcatr/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.12	09/06/10 SMI"
+#ident	"@(#)prototype_com	1.13	09/10/30 SMI"
 #
 
 # This required package information file contains a list of package contents.
@@ -87,7 +87,6 @@
 f none var/tomcat6/webapps/host-manager/images/update.gif 0644 root bin
 d none var/tomcat6/webapps/host-manager/WEB-INF 0755 root bin
 f none var/tomcat6/webapps/host-manager/WEB-INF/web.xml 0644 root bin
-s none var/tomcat6/webapps/docs=../../../usr/tomcat6/docs
 d none var/tomcat6/webapps/manager 0755 root bin
 f none var/tomcat6/webapps/manager/status.xsd 0644 root bin
 d none var/tomcat6/webapps/manager/images 0755 root bin
@@ -108,353 +107,5 @@
 f none var/tomcat6/webapps/manager/META-INF/context.xml 0644 root bin
 f none var/tomcat6/webapps/manager/xform.xsl 0644 root bin
 f none var/tomcat6/webapps/manager/401.jsp 0644 root bin
-d none var/tomcat6/webapps/examples 0755 root bin
-d none var/tomcat6/webapps/examples/jsp 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/source.jsp.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/num 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/num/numguess.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/num/numguess.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/num/numguess.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/forward 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/forward/forward.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/forward/forward.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/forward/one.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/forward/fwd.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/forward/two.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/forward/one.jsp.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/chat 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/chat/chat.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/chat/login.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/chat/post.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/chat/chat.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/chat/login.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/chat/post.jsp.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/images 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/images/read.gif 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/images/return.gif 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/images/code.gif 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/images/execute.gif 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/dates 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/dates/date.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/dates/date.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/dates/date.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/sessions 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/sessions/DummyCart.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/sessions/crt.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/sessions/carts.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/sessions/carts.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/sessions/carts.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/index.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/jsptoserv 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/jsptoserv/jts.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsptoserv/hello.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsptoserv/hello.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsptoserv/servletToJsp.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/checkbox 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/checkbox/CheckTest.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/checkbox/checkresult.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/checkbox/check.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/checkbox/cresult.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/checkbox/checkresult.jsp.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/plugin 0755 root bin
-d none var/tomcat6/webapps/examples/jsp/plugin/applet 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/plugin/applet/Clock2.class 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/plugin/applet/Clock2.java 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/plugin/plugin.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/plugin/plugin.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/plugin/plugin.jsp 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/simpletag 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/simpletag/foo.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/simpletag/foo.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/simpletag/foo.jsp 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/tagplugin 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/tagplugin/foreach.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/tagplugin/howto.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/tagplugin/choose.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/tagplugin/if.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/tagplugin/notes.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/tagplugin/foreach.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/tagplugin/choose.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/tagplugin/choose.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/tagplugin/foreach.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/tagplugin/if.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/tagplugin/if.jsp.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/cal 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/cal/cal2.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/cal/calendar.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/cal/cal2.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/cal/Entry.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/cal/TableBean.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/cal/cal1.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/cal/JspCalendar.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/cal/Entries.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/cal/login.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/cal/cal1.jsp 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/jsp2 0755 root bin
-d none var/tomcat6/webapps/examples/jsp/jsp2/jspx 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.jspx 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/svgexample.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jspx.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jpg 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jspx 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.jspx.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/displayProducts.tag.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.tag.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/xhtmlbasic.tag.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/helloWorld.tag.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/jsp2/simpletag 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/BookBean.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/FindBookSimpleTag.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/Functions.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/RepeatSimpleTag.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/simpletag/HelloWorldSimpleTag.java.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/TileSimpleTag.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/HelloWorldSimpleTag.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/ShuffleSimpleTag.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/FooBean.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/jsp2/el 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/Functions.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/functions.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/functions.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/functions.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.jsp 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/jsp2/misc 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/misc/config.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/misc/config.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/misc/prelude.jspf.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/misc/coda.jspf 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/misc/EchoAttributesTag.java.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/misc/prelude.jspf 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/misc/coda.jspf.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/misc/config.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/snp 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/snp/snoop.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/snp/snoop.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/snp/snoop.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/source.jsp 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/error 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/error/error.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/error/errorpge.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/error/er.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/error/errorpge.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/error/err.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/error/err.jsp 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/xml 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/xml/xml.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/xml/xml.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/xml/xml.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/colors 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/colors/colrs.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/colors/colors.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/colors/clr.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/colors/colrs.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/colors/ColorGameBean.html 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/include 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/include/foo.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/include/foo.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/include/inc.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/include/foo.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/include/include.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/include/include.jsp 0644 root bin
-d none var/tomcat6/webapps/examples/jsp/security 0755 root bin
-d none var/tomcat6/webapps/examples/jsp/security/protected 0755 root bin
-f none var/tomcat6/webapps/examples/jsp/security/protected/error.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/security/protected/index.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/security/protected/login.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/security/protected/error.jsp 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/security/protected/index.jsp.html 0644 root bin
-f none var/tomcat6/webapps/examples/jsp/security/protected/login.jsp.html 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF 0755 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/tags 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/tags/helloWorld.tag 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/tags/panel.tag 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/tags/displayProducts.tag 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/tags/xhtmlbasic.tag 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/lib 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/lib/standard.jar 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/lib/jstl.jar 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/jsp2 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes 0755 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/error 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/error/Smart.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/error/Smart.java 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/SessionExample.class 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/checkbox 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/filters 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings.properties 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.java 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/chat 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet$MessageSender.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/servletToJsp.class 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/cal 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/TableBean.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entry.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entries.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/JspCalendar.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entries.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/TableBean.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/JspCalendar.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entry.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.java 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/validators 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.class 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/listeners 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/util 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/util/HTMLFilter.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/util/HTMLFilter.class 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/num 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.class 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/examples 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTag.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/LogTag.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/LogTag.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTag.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/CookieExample.java 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/colors 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/CookieExample.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.class 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/dates 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/dates/JspCalendar.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/dates/JspCalendar.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/SessionExample.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_en.properties 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2 0755 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples 0755 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/classes/sessions 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.class 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/servletToJsp.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_es.properties 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/jsp 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/jsp/example-taglib.tld 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/jsp/debug-taglib.tld 0644 root bin
-d none var/tomcat6/webapps/examples/WEB-INF/jsp/applet 0755 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/jsp/applet/Clock2.java 0644 root bin
-f none var/tomcat6/webapps/examples/WEB-INF/web.xml 0644 root bin
-d none var/tomcat6/webapps/examples/servlets 0755 root bin
-f none var/tomcat6/webapps/examples/servlets/reqheaders.html 0644 root bin
-f none var/tomcat6/webapps/examples/servlets/helloworld.html 0644 root bin
-f none var/tomcat6/webapps/examples/servlets/reqparams.html 0644 root bin
-f none var/tomcat6/webapps/examples/servlets/index.html 0644 root bin
-d none var/tomcat6/webapps/examples/servlets/images 0755 root bin
-f none var/tomcat6/webapps/examples/servlets/images/return.gif 0644 root bin
-f none var/tomcat6/webapps/examples/servlets/images/code.gif 0644 root bin
-f none var/tomcat6/webapps/examples/servlets/images/execute.gif 0644 root bin
-f none var/tomcat6/webapps/examples/servlets/reqinfo.html 0644 root bin
-f none var/tomcat6/webapps/examples/servlets/sessions.html 0644 root bin
-f none var/tomcat6/webapps/examples/servlets/cookies.html 0644 root bin
-f none var/tomcat6/webapps/examples/index.html 0644 root bin
 d none var/tomcat6/webapps/ROOT 0755 root bin
-f none var/tomcat6/webapps/ROOT/RELEASE-NOTES.txt 0644 root bin
-f none var/tomcat6/webapps/ROOT/tomcat.svg 0644 root bin
-d none var/tomcat6/webapps/ROOT/WEB-INF 0755 root bin
-f none var/tomcat6/webapps/ROOT/WEB-INF/web.xml 0644 root bin
-f none var/tomcat6/webapps/ROOT/tomcat-power.gif 0644 root bin
-f none var/tomcat6/webapps/ROOT/asf-logo-wide.gif 0644 root bin
-f none var/tomcat6/webapps/ROOT/index.html 0644 root bin
-f none var/tomcat6/webapps/ROOT/tomcat.gif 0644 root bin
-f none var/tomcat6/webapps/ROOT/favicon.ico 0644 root bin
-f none var/tomcat6/webapps/ROOT/build.xml 0644 root bin
-f none var/tomcat6/webapps/ROOT/index.jsp 0644 root bin
+f renamenew var/tomcat6/webapps/ROOT/index.jsp 0644 root bin
--- a/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl	Sun Dec 20 07:12:51 2009 +0200
@@ -24,7 +24,7 @@
 # Use is subject to license terms.
 #
 
-#ident	"@(#)pkginfo.tmpl	1.6	09/10/01 SMI"
+#ident	"@(#)pkginfo.tmpl	1.7	09/10/29 SMI"
 #
 #
 # This required package information file describes characteristics of the
@@ -40,7 +40,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="Wireshark - Network protocol analyzer (1.2.2)"
+DESC="Wireshark - Network protocol analyzer (1.2.3)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWwireshark/prototype_com	Sun Dec 20 07:09:18 2009 +0200
+++ b/usr/src/pkgdefs/SUNWwireshark/prototype_com	Sun Dec 20 07:12:51 2009 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.6	09/10/01 SMI"
+#ident	"@(#)prototype_com	1.7	09/10/29 SMI"
 #
 
 # This required package information file contains a list of package contents.
@@ -58,25 +58,25 @@
 s none usr/lib/libwsutil.so=libwsutil.so.0.0.0
 d none usr/lib/wireshark 0755 root bin
 d none usr/lib/wireshark/plugins 0755 root bin
-d none usr/lib/wireshark/plugins/1.2.2 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.2/asn1.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/coseventcomm.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/cosnaming.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/docsis.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/ethercat.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/gryphon.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/irda.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/m2m.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/mate.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/opcua.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/parlay.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/profinet.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/sercosiii.so 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.2/stats_tree.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/tango.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/unistim.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/wimax.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.2/wimaxasncp.so 0555 root bin
+d none usr/lib/wireshark/plugins/1.2.3 0755 root bin
+f none usr/lib/wireshark/plugins/1.2.3/asn1.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/coseventcomm.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/cosnaming.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/docsis.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/ethercat.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/gryphon.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/irda.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/m2m.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/mate.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/opcua.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/parlay.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/profinet.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/sercosiii.so 0755 root bin
+f none usr/lib/wireshark/plugins/1.2.3/stats_tree.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/tango.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/unistim.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/wimax.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.3/wimaxasncp.so 0555 root bin
 d none usr/sbin 0755 root bin
 f none usr/sbin/capinfos 0555 root bin
 f none usr/sbin/dumpcap 0555 root bin