From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster
---
components/curl/Makefile | 1
components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AuthRightsSettings.java | 78
components/rdiff-backup/rdiff-backup-GENFRAG.p5m | 31
components/libarchive/libarchive.p5m | 70
components/python/argparse/argparse.p5m | 40
components/libarchive/patches/libarchive-archive_entry_linkify.3.patch | 34
components/python/mock/Makefile | 10
components/aalib/aalib.license | 26
components/python/pep8/Makefile | 4
components/pylint/Makefile | 8
components/rdiff-backup/Makefile | 24
components/libarchive/patches/archive_write_set_format_ar.c.patch | 16
components/samba/samba/Makefile | 4
components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserManagedObject.java | 32
components/mc/mc.p5m | 2
components/autogen/autogen.p5m | 75
components/python/twisted-web2/Makefile | 4
components/libarchive/patches/archive_string.c.patch | 17
components/libarchive/patches/libarchive-archive_write_set_options.3.patch | 28
components/libarchive/patches/archive_write_set_format_zip.c.patch | 16
components/libarchive/patches/libarchive-archive_read_set_options.3.patch | 25
components/samba/samba/samba.p5m | 2
components/python/netaddr/netaddr-PYVER.p5m | 81
components/librsync/Makefile | 4
components/libarchive/patches/libarchive-archive_write.3.patch | 87
components/mc/Makefile | 4
components/libarchive/patches/libarchive-archive_entry.3.patch | 65
components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/help/usermgr-advtab.html | 5
components/python/python26/python-26.p5m | 9
components/imagemagick/patches/16615558.patch | 21
components/ircii/Makefile | 14
components/open-fabrics/libibmad/patches/base.patch | 747 +++++++
components/libarchive/patches/libarchive-archive_write_disk.3.patch | 82
components/libarchive/patches/libarchive-archive_entry_perms.3.patch | 46
components/ircii/patches/ircterm.h.patch | 32
components/python/imaging/Makefile | 11
components/visual-panels/usermgr/src/apis/usermgr.xml | 12
components/python/python26/python-26-tests.p5m | 30
components/python/twisted/Makefile | 8
components/python/argparse/argparse.license | 279 ++
components/libsndfile/Makefile | 4
components/spawn-fcgi/spawn-fcgi.p5m | 2
components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserMgrPanelDescriptor.java | 6
components/libarchive/patches/libarchive-archive_entry_paths.3.patch | 41
components/squid/Makefile | 39
components/spawn-fcgi/Makefile | 9
components/python/netaddr/resolve.deps | 4
make-rules/ips-buildinfo.mk | 4
components/python/mako/Makefile | 6
components/python/simplejson/Makefile | 7
components/python/nose/Makefile | 4
components/python/cherrypy/Makefile | 6
components/squid/squid.p5m | 457 +++-
components/libarchive/libarchive.license | 150 +
components/openssl/openssl-1.0.1/mapfile.wanboot | 3
components/libarchive/patches/libarchive-libarchive.3.patch | 100 +
components/pixz/pixz.p5m | 43
components/libarchive/patches/libarchive-archive_entry_time.3.patch | 35
components/python/ldtp/Makefile | 6
components/pixz/resolve.deps | 3
components/openssl/openssl-1.0.1/Makefile | 3
components/python/python27/Makefile | 2
components/python/argparse/Makefile | 52
components/rdiff-backup/rdiff-backup-PYVER.p5m | 87
components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AdvancedSettingsDialog.java | 5
components/squid/files/http-squid | 0
components/pixz/Makefile | 65
components/libarchive/patches/libarchive-libarchive-formats.5.patch | 86
components/squid/files/http-squid.xml | 0
components/aalib/aalib.p5m | 32
components/antlr/Makefile | 4
components/python/cssutils/Makefile | 10
components/doxygen/patches/doxygen1.patch | 20
components/libarchive/patches/libarchive-archive_util.3.patch | 56
components/python/jsonrpclib/Makefile | 6
components/libarchive/patches/archive_write_set_format_pax.c.patch | 27
components/openssl/openssl-1.0.1/patches/openssl-t4-inline.sparc-patch | 72
components/doxygen/Makefile | 12
components/logilab-astng/Makefile | 8
components/python/setuptools/Makefile | 6
components/python/argparse/argparse-26.p5m | 52
components/python/python26/Makefile | 2
make-rules/setup.py.mk | 10
components/squid/files/squid.conf.default | 0
components/ircii/ircii.p5m | 7
components/autogen/patches/guile-iface.h.patch | 35
components/python/pybonjour/Makefile | 6
components/pixz/files/pixz.1 | 139 +
components/python/netaddr/Makefile | 58
components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/resources/Resources.properties | 5
components/libarchive/Makefile | 64
components/autogen/Makefile | 23
components/libarchive/patches/libarchive-archive_entry_acl.3.patch | 35
components/logilab-common/Makefile | 15
components/libarchive/patches/libarchive-archive_entry_stat.3.patch | 37
components/libarchive/resolve.deps | 6
components/autogen/autogen.license | 850 ++++++--
components/python/argparse/resolve.deps | 1
/dev/null | 52
components/libarchive/patches/libarchive-archive_read.3.patch | 101 +
components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AuthRightsPanel.java | 631 ++++++
components/libarchive/patches/libarchive-archive_read_disk.3.patch | 93
components/python/ply/Makefile | 6
components/python/decorator/Makefile | 4
.hgtags | 2
105 files changed, 5,160 insertions(+), 640 deletions(-)
diff --git a/.hgtags b/.hgtags
index 268e022..6cf0fc1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -75,3 +75,5 @@
85b43edad4d23a200505acff491583af40cb61fb s12-20.1
95c29b5f89d200df5a4ed06408125483aa928bb4 s12-21
dbd9d49e871726c93660a3a57e0b9c0e965322e4 s12-21.1
+035c88cfb44c1f4106c619fe01b11bdcbda580d1 s12-22
+a1701fc2793fb61803a3acf71447a9e23a28ba58 s12-23
diff --git a/components/aalib/aalib.license b/components/aalib/aalib.license
index 19c13d2..9831c23 100644
--- a/components/aalib/aalib.license
+++ b/components/aalib/aalib.license
@@ -1,10 +1,4 @@
-Copyright (C) 1997-2009 Jan Hubicka (hubicka@freesoft.cz)
-Copyright (C) 1997-2009 Thomas A. K. Kjaer (takjaer@daimi.aau.dk)
-Copyright (C) 1997-2009 Tim Newsome (nuisance@cmu.edu)
-Copyright (C) 1997-2009 Kamil Toman (toman@artax.karlin.mff.cuni.cz)
-
-
- GNU LIBRARY GENERAL PUBLIC LICENSE
+ GNU LIBRARY GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1991 Free Software Foundation, Inc.
@@ -57,7 +51,7 @@
want its recipients to know that what they have is not the original
version, so that any problems introduced by others will not reflect on
the original authors' reputations.
-
+
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that companies distributing free
software will individually obtain patent licenses, thus in effect
@@ -104,7 +98,7 @@
Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.
-
+
GNU LIBRARY GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -151,7 +145,7 @@
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
-
+
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
@@ -209,7 +203,7 @@
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -260,7 +254,7 @@
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-
+
6. As an exception to the Sections above, you may also compile or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -314,7 +308,7 @@
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -355,7 +349,7 @@
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
-
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -407,7 +401,7 @@
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -441,7 +435,7 @@
DAMAGES.
END OF TERMS AND CONDITIONS
-
+
Appendix: How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
diff --git a/components/aalib/aalib.p5m b/components/aalib/aalib.p5m
index e143d5a..afc6aa7 100644
--- a/components/aalib/aalib.p5m
+++ b/components/aalib/aalib.p5m
@@ -22,29 +22,34 @@
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
-set name=pkg.fmri value=pkg:/library/aalib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.human-version value=$(HUMAN_VERSION)
+set name=pkg.fmri \
+ value=pkg:/library/aalib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="AAlib - Ascii art graphics library"
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=com.oracle.info.description value="the AAlib library"
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=com.oracle.info.tpno value=6118
+set name=info.classification \
+ value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
- value=LSARC/2009/302
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2009/302
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license aalib.license license='LGPLv2'
-
-file path=usr/bin/aalib-config
file path=usr/bin/$(MACH64)/aalib-config
+file path=usr/bin/aalib-config
file usr/bin/aafire path=usr/demo/aalib/aafire mode=0555
file usr/bin/aainfo path=usr/demo/aalib/aainfo mode=0555
file usr/bin/aasavefont path=usr/demo/aalib/aasavefont mode=0555
file usr/bin/aatest path=usr/demo/aalib/aatest mode=0555
file path=usr/include/aalib.h
+link path=usr/lib/$(MACH64)/libaa.so target=libaa.so.1.0.4
+link path=usr/lib/$(MACH64)/libaa.so.1 target=libaa.so.1.0.4
file path=usr/lib/$(MACH64)/libaa.so.1.0.4
+#file path=usr/lib/$(MACH64)/llib-laa.ln
+link path=usr/lib/libaa.so target=libaa.so.1.0.4
+link path=usr/lib/libaa.so.1 target=libaa.so.1.0.4
file path=usr/lib/libaa.so.1.0.4
+#file path=usr/lib/llib-laa
+#file path=usr/lib/llib-laa.ln
file path=usr/share/aclocal/aalib.m4
file ANNOUNCE path=usr/share/doc/aalib/ANNOUNCE
file AUTHORS path=usr/share/doc/aalib/AUTHORS
@@ -121,7 +126,4 @@
file path=usr/share/man/man3/aa_uninitmouse.3
file path=usr/share/man/man3/mem_d.3
file path=usr/share/man/man3/save_d.3
-link path=usr/lib/$(MACH64)/libaa.so target=libaa.so.1.0.4
-link path=usr/lib/$(MACH64)/libaa.so.1 target=libaa.so.1.0.4
-link path=usr/lib/libaa.so target=libaa.so.1.0.4
-link path=usr/lib/libaa.so.1 target=libaa.so.1.0.4
+license aalib.license license=LGPLv2
diff --git a/components/antlr/Makefile b/components/antlr/Makefile
index d4e2456..e554b05 100644
--- a/components/antlr/Makefile
+++ b/components/antlr/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -62,6 +62,8 @@
COMPONENT_TEST_TARGETS = test
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32)
diff --git a/components/autogen/Makefile b/components/autogen/Makefile
index b03f993..5752950 100644
--- a/components/autogen/Makefile
+++ b/components/autogen/Makefile
@@ -23,12 +23,12 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= autogen
-COMPONENT_VERSION= 5.9
+COMPONENT_VERSION= 5.16.2
COMPONENT_PROJECT_URL= http://www.gnu.org/software/autogen/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:bc2181f9568897b9ad4d57978bc0a72e2a31b97e837999e6f839bdbbc02c3fc8
+ sha256:aa51f5adbf49c2cb48a7d6de3dbab15b89e0a04e7152195fe6fb3380e05c4991
COMPONENT_ARCHIVE_URL= http://ftp.gnu.org/gnu/autogen/rel$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/autogen
@@ -46,15 +46,28 @@
# strip the environment or install target fails
ENV += -i
+# Replace all occurrences of "echo" with "/usr/gnu/bin/echo" in the two
+# scripts used by autogen that munge the man and mdoc output. This prevents
+# bogus conversions (like "\f" -> Control-L) happening.
+# Adjust "tr" to "/usr/gnu/bin/tr" in the autoopts vendor.test.
+# These changes now allow the autoopts tests to successfully complete.
+COMPONENT_POST_UNPACK_ACTION = \
+ $(GSED) -i -e 's|echo|/usr/gnu/bin/echo|' \
+ $(SOURCE_DIR)/autoopts/tpl/mdoc2man.sh ; \
+ $(GSED) -i -e 's|echo|/usr/gnu/bin/echo|' \
+ $(SOURCE_DIR)/autoopts/tpl/texi2mdoc.sh ; \
+ $(GSED) -i -e 's| tr | /usr/gnu/bin/tr |' \
+ $(SOURCE_DIR)/autoopts/test/vendor.test
+
# Enable ASLR for this component
ASLR_MODE = $(ASLR_ENABLE)
# common targets
-build: $(BUILD_32)
+build: $(BUILD_32_and_64)
-install: $(INSTALL_32)
+install: $(INSTALL_32_and_64)
-test: $(TEST_32)
+test: $(TEST_32_and_64)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
diff --git a/components/autogen/autogen.license b/components/autogen/autogen.license
index ac1b020..bcff11a 100644
--- a/components/autogen/autogen.license
+++ b/components/autogen/autogen.license
@@ -1,285 +1,626 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 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 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 Library General Public License instead.) You can apply it to
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ 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.
- 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.
+ 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.
- 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.
+ 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, 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
- 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".
+ TERMS AND CONDITIONS
-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.
+ 0. Definitions.
- 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.
+ "This License" refers to version 3 of the GNU General Public License.
-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.
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
- 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:
+ "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.
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
+ 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.
- 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.
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
- 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.)
-
-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.
+ 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.
-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.
+ 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.
-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.
+ 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.
- 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:
+ 1. Source Code.
- 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,
+ 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.
- 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,
+ 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.
- 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.)
+ 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.
-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.
+ 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.
-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.
-
- 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.
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
- 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.
+ The Corresponding Source for a work in source code form is that
+same work.
- 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
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ "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.
+
+ 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
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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
+ 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 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.
+
+ 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.
+
+ 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
-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.
+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.
-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.
+ 13. Use with the GNU Affero General Public License.
-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.
+ 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.
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this 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.
+ 14. Revised Versions of this License.
- 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
+ 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.
- 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.
+ 15. Disclaimer of Warranty.
- 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.
+ 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.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ 16. Limitation of Liability.
+
+ 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.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ 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
@@ -287,15 +628,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,
@@ -304,42 +645,35 @@
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
-
+ 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.
+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".
-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:
+ 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/>.
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
+ 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>.
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-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 Library General
-Public License instead of this License.
-
---------------------------------------------------------------------
+-----------------------------------------------------------------------
GNU Free Documentation License
Version 1.2, November 2002
diff --git a/components/autogen/autogen.p5m b/components/autogen/autogen.p5m
index 9a1f45a..29c5aae 100644
--- a/components/autogen/autogen.p5m
+++ b/components/autogen/autogen.p5m
@@ -24,51 +24,78 @@
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/developer/build/autogen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="GNU autogen utility"
set name=pkg.description \
value="AutoGen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text."
-set name=pkg.summary value="GNU autogen utility"
set name=com.oracle.info.description value="GNU autogen"
-set name=com.oracle.info.tpno value=6148
+set name=com.oracle.info.tpno value=11805
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2008/315
+set name=org.opensolaris.arc-caseid value=PSARC/2008/315 value=PSARC/2012/367
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/autogen
+file path=usr/bin/$(MACH64)/autoopts-config
+file usr/bin/$(MACH64)/autogen path=usr/bin/autogen
file path=usr/bin/autoopts-config
-file path=usr/bin/columns
-file path=usr/bin/getdefs
-file path=usr/bin/xml2ag
+file usr/bin/$(MACH64)/columns path=usr/bin/columns
+file usr/bin/$(MACH64)/getdefs path=usr/bin/getdefs
+file usr/bin/$(MACH64)/xml2ag path=usr/bin/xml2ag
file path=usr/include/autoopts/options.h
file path=usr/include/autoopts/usage-txt.h
-file path=usr/lib/libguileopts.a
-file path=usr/lib/libguileopts.so.0.0.1
+file path=usr/lib/$(MACH64)/libopts.a
+link path=usr/lib/$(MACH64)/libopts.so target=libopts.so.25.11.5
+link path=usr/lib/$(MACH64)/libopts.so.25 target=libopts.so.25.11.5
+file path=usr/lib/$(MACH64)/libopts.so.25.11.5
file path=usr/lib/libopts.a
-file path=usr/lib/libopts.so.25.3.0
-file path=usr/lib/pkgconfig/autoopts.pc
+link path=usr/lib/libopts.so target=libopts.so.25.11.5
+link path=usr/lib/libopts.so.25 target=libopts.so.25.11.5
+file path=usr/lib/libopts.so.25.11.5
+file usr/share/pkgconfig/autoopts.pc path=usr/lib/pkgconfig/autoopts.pc
file path=usr/share/aclocal/autoopts.m4
-file path=usr/share/aclocal/liboptschk.m4
file path=usr/share/autogen/aginfo.tpl
file path=usr/share/autogen/aginfo3.tpl
-file path=usr/share/autogen/agman-lib.tpl
+file path=usr/share/autogen/agman-cmd.tpl
+file path=usr/share/autogen/agman.tlib
file path=usr/share/autogen/agman1.tpl
file path=usr/share/autogen/agman3.tpl
+file path=usr/share/autogen/agmdoc-cmd.tpl
+file path=usr/share/autogen/agpl.lic
+file path=usr/share/autogen/agtexi-cmd.tpl
file path=usr/share/autogen/autoopts.m4
-file path=usr/share/autogen/confmacs.tpl
+file path=usr/share/autogen/bits.tpl
+file path=usr/share/autogen/cmd-doc.tlib
+file path=usr/share/autogen/confmacs.tlib
file path=usr/share/autogen/conftest.tpl
-file path=usr/share/autogen/fsm-macro.tpl
-file path=usr/share/autogen/fsm-trans.tpl
+file path=usr/share/autogen/def2pot.tpl
+file path=usr/share/autogen/fsm-macro.tlib
+file path=usr/share/autogen/fsm-trans.tlib
file path=usr/share/autogen/fsm.tpl
file path=usr/share/autogen/getopt.tpl
-file path=usr/share/autogen/optcode.tpl
-file path=usr/share/autogen/opthead.tpl
+file path=usr/share/autogen/gpl.lic
+file path=usr/share/autogen/gplv2.lic
+file path=usr/share/autogen/lgpl.lic
+file path=usr/share/autogen/liboptschk.m4
+file path=usr/share/autogen/man2man
+file path=usr/share/autogen/man2mdoc
+file path=usr/share/autogen/man2texi
+file path=usr/share/autogen/mbsd.lic
+file path=usr/share/autogen/mdoc2man
+file path=usr/share/autogen/mdoc2mdoc
+file path=usr/share/autogen/mdoc2texi
+file path=usr/share/autogen/optcode.tlib
+file path=usr/share/autogen/opthead.tlib
file path=usr/share/autogen/options.tpl
-file path=usr/share/autogen/optlib.tpl
-file path=usr/share/autogen/optmain.tpl
+file path=usr/share/autogen/optlib.tlib
+file path=usr/share/autogen/optmain.tlib
file path=usr/share/autogen/rc-sample.tpl
file path=usr/share/autogen/stdoptions.def
+file path=usr/share/autogen/strings.tpl
+file path=usr/share/autogen/texi2man
+file path=usr/share/autogen/texi2mdoc
+file path=usr/share/autogen/texi2texi
+file path=usr/share/autogen/tpl-config.tlib
+file path=usr/share/autogen/usage.tlib
file path=usr/share/info/autogen.info
file path=usr/share/info/autogen.info-1
file path=usr/share/info/autogen.info-2
@@ -98,8 +125,4 @@
file path=usr/share/man/man3/streqvmap.3
file path=usr/share/man/man3/strneqvcmp.3
file path=usr/share/man/man3/strtransform.3
-license autogen.license license="GPLv2, FDLv1.2"
-link path=usr/lib/libguileopts.so target=libguileopts.so.0.0.1
-link path=usr/lib/libguileopts.so.0 target=libguileopts.so.0.0.1
-link path=usr/lib/libopts.so target=libopts.so.25.3.0
-link path=usr/lib/libopts.so.25 target=libopts.so.25.3.0
+license autogen.license license="GPLv3, FDLv1.2"
diff --git a/components/autogen/patches/guile-iface.h.patch b/components/autogen/patches/guile-iface.h.patch
new file mode 100644
index 0000000..46aad58
--- /dev/null
+++ b/components/autogen/patches/guile-iface.h.patch
@@ -0,0 +1,35 @@
+The guile gh_scm2ulong() and scm_to_ulong() routines should really
+return an unsigned long otherwise the generation of the getdefs
+opts.[h,c] files from the opts.def file fails for 32-bit SPARC.
+
+This problem has been reported upstream, and the fix is in autogen-5.17.5pre2
+
+--- autogen-5.16.2/agen5/guile-iface.h.orig 2013-05-31 09:59:18.924928189 -0700
++++ autogen-5.16.2/agen5/guile-iface.h 2013-05-31 10:00:51.274085992 -0700
+@@ -32,7 +32,7 @@
+ # define AG_SCM_SYM_P(_s) SCM_SYMBOLP(_s)
+ # define AG_SCM_TO_INT(_i) gh_scm2int(_i)
+ # define AG_SCM_TO_LONG(_v) gh_scm2long(_v)
+-# define AG_SCM_TO_ULONG(_v) gh_scm2ulong(_v)
++# define AG_SCM_TO_ULONG(_v) ((unsigned long)gh_scm2ulong(_v))
+ # define AG_SCM_VEC_P(_v) SCM_VECTORP(_v)
+
+ #elif GUILE_VERSION < 200000
+@@ -58,7 +58,7 @@
+ # define AG_SCM_SYM_P(_s) scm_is_symbol(_s)
+ # define AG_SCM_TO_INT(_i) scm_to_int(_i)
+ # define AG_SCM_TO_LONG(_v) scm_to_long(_v)
+-# define AG_SCM_TO_ULONG(_v) scm_to_ulong(_v)
++# define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v))
+ # define AG_SCM_VEC_P(_v) scm_is_vector(_v)
+
+ #elif GUILE_VERSION < 201000
+@@ -84,7 +84,7 @@
+ # define AG_SCM_SYM_P(_s) scm_is_symbol(_s)
+ # define AG_SCM_TO_INT(_i) scm_to_int(_i)
+ # define AG_SCM_TO_LONG(_v) scm_to_long(_v)
+-# define AG_SCM_TO_ULONG(_v) scm_to_ulong(_v)
++# define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v))
+ # define AG_SCM_VEC_P(_v) scm_is_vector(_v)
+
+ #else
diff --git a/components/curl/Makefile b/components/curl/Makefile
index 7d79b9a..551ac31 100644
--- a/components/curl/Makefile
+++ b/components/curl/Makefile
@@ -70,6 +70,7 @@
CONFIGURE_OPTIONS += --with-ca-path=/etc/openssl/certs
CONFIGURE_OPTIONS += --with-zlib=/usr --with-libidn=/usr
CONFIGURE_OPTIONS += --with-pic
+CONFIGURE_OPTIONS += --without-libssh2
CONFIGURE_OPTIONS += "curl_disallow_getifaddrs=yes"
LINT_FLAGS += -I$(SOURCE_DIR)/include
diff --git a/components/doxygen/Makefile b/components/doxygen/Makefile
index 2156e81..0d810bb 100644
--- a/components/doxygen/Makefile
+++ b/components/doxygen/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -50,14 +50,16 @@
# Need to override default options since configure doesn't
# understand CC, CXX, etc.
-CONFIGURE_OPTIONS = --platform solaris-cc
+CONFIGURE_OPTIONS = --platform solaris-cc-64
CONFIGURE_OPTIONS += --prefix /usr
CONFIGURE_OPTIONS += --enable-langs nl,sv,cz,fr,id,it,de,jp,je,es,fi,ru,hr,pl,pt,hu,kr,ke,ro,si,cn,no,br,dk,sk,ua,gr,tw,sr,ca,lt,za,ar,fa
-# common targets
-build: $(BUILD_32)
+ASLR_MODE = $(ASLR_ENABLE)
-install: $(INSTALL_32)
+# common targets
+build: $(BUILD_64)
+
+install: $(INSTALL_64)
cd $(PROTO_DIR) ; $(UNPACK) ../../../$(COMPONENT_ARCHIVE_1)
test: $(NO_TESTS)
diff --git a/components/doxygen/patches/doxygen1.patch b/components/doxygen/patches/doxygen1.patch
index 5b9c226..76e2bd8 100644
--- a/components/doxygen/patches/doxygen1.patch
+++ b/components/doxygen/patches/doxygen1.patch
@@ -29,3 +29,23 @@
TMAKE_LFLAGS_RELEASE =
TMAKE_LFLAGS_DEBUG =
TMAKE_LFLAGS_SHLIB = -G -h $(TARGET1)
+--- doxygen-1.7.6.1/tmake/lib/solaris-cc-64/tmake.conf-orig 2013-03-26 19:19:25.644626673 -0500
++++ doxygen-1.7.6.1/tmake/lib/solaris-cc-64/tmake.conf 2013-03-26 19:22:10.411978779 -0500
+@@ -17,7 +17,7 @@ TMAKE_CFLAGS_SHLIB = -KPIC
+ TMAKE_CFLAGS_YACC =
+
+ TMAKE_CXX = CC
+-TMAKE_CXXFLAGS = $$TMAKE_CFLAGS
++TMAKE_CXXFLAGS = -norunpath -D__USE_LEGACY_PROTOTYPES__ -m64
+ TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON
+ TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF
+ TMAKE_CXXFLAGS_RELEASE = -xO2
+@@ -37,7 +37,7 @@ TMAKE_LIBDIR_OPENGL =
+ TMAKE_LINK = CC
+ # Jan Wortelboer <janw@wins.uva.nl> suggests avoiding $LD_LIBRARY_PATH:
+ TMAKE_LINK_SHLIB = CC -R$(QTDIR)/lib:/usr/openwin/lib
+-TMAKE_LFLAGS = -64 -xtarget=generic64
++TMAKE_LFLAGS = -norunpath -m64
+ TMAKE_LFLAGS_RELEASE =
+ TMAKE_LFLAGS_DEBUG =
+ TMAKE_LFLAGS_SHLIB = -G -h $(TARGET1)
diff --git a/components/imagemagick/patches/16615558.patch b/components/imagemagick/patches/16615558.patch
new file mode 100644
index 0000000..0f4ad41
--- /dev/null
+++ b/components/imagemagick/patches/16615558.patch
@@ -0,0 +1,21 @@
+The following link explains the issue in detail:
+http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23117
+
+--------------------------------------------------------------------------------
+--- ImageMagick-6.8.3/coders/url.c Mon Dec 10 05:09:00 2012
++++ ImageMagick-6.8.3/coders/url.c Mon Apr 22 00:07:50 2013
+@@ -154,12 +154,9 @@
+ file=fdopen(unique_file,"wb");
+ if ((unique_file == -1) || (file == (FILE *) NULL))
+ {
+- read_info=DestroyImageInfo(read_info);
+- (void) CopyMagickString(image->filename,read_info->filename,
+- MaxTextExtent);
+ ThrowFileException(exception,FileOpenError,"UnableToCreateTemporaryFile",
+- image->filename);
+- image=DestroyImageList(image);
++ read_info->filename);
++ read_info=DestroyImageList(read_info);
+ return((Image *) NULL);
+ }
+ (void) CopyMagickString(filename,image_info->magick,MaxTextExtent);
diff --git a/components/ircii/Makefile b/components/ircii/Makefile
index 8931f7b..1af9480 100644
--- a/components/ircii/Makefile
+++ b/components/ircii/Makefile
@@ -40,7 +40,15 @@
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
+# Needed to correctly include <curses.h> and <term.h> when compiling the
+# various C source files.
+CFLAGS += -DINCLUDE_CURSES_H
+
CONFIGURE_ENV += CC="$(CC)"
+CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
+
+CC += $(CC_BITS)
+COMPONENT_BUILD_ARGS += CC="$(CC)"
# We need to reset configure options here because ircii is confused with
# CC and CFLAGS definitions as configure parameters.
@@ -57,15 +65,15 @@
#
# This action modifies the libexecdir setting in the Makefile to /usr/bin
COMPONENT_POST_CONFIGURE_ACTION = \
- $(GSED) -i -e 's|/usr/libexec|/usr/bin|' $(BUILD_DIR_32)/Makefile
+ $(GSED) -i -e 's|/usr/libexec|/usr/bin|' $(BUILD_DIR_64)/Makefile
# Enable ASLR for this component
ASLR_MODE = $(ASLR_ENABLE)
# common targets
-build: $(BUILD_32)
+build: $(BUILD_64)
-install: $(INSTALL_32)
+install: $(INSTALL_64)
test: $(NO_TESTS)
diff --git a/components/ircii/ircii.p5m b/components/ircii/ircii.p5m
index 97ed6f9..bef82b6 100644
--- a/components/ircii/ircii.p5m
+++ b/components/ircii/ircii.p5m
@@ -28,7 +28,8 @@
set name=pkg.description \
value="A terminal-based IRC client that runs under most unix platforms."
set name=pkg.human-version value=$(COMPONENT_VERSION)
-set name=com.oracle.info.description value="the ircii Internet Relay Chat Client"
+set name=com.oracle.info.description \
+ value="the ircii Internet Relay Chat Client"
set name=com.oracle.info.tpno value=12675
set name=info.classification \
value=org.opensolaris.category.2008:Applications/Internet
@@ -36,8 +37,8 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=LSARC/2008/373
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file usr/bin/irc-$(COMPONENT_VERSION) path=usr/bin/irc
-file path=usr/bin/ircflush
+file usr/bin/$(MACH64)/irc-$(COMPONENT_VERSION) path=usr/bin/irc
+file usr/bin/$(MACH64)/ircflush path=usr/bin/ircflush
file path=usr/bin/ircio
file path=usr/bin/wserv
file path=usr/share/irc/help/!
diff --git a/components/ircii/patches/ircterm.h.patch b/components/ircii/patches/ircterm.h.patch
new file mode 100644
index 0000000..6a23186
--- /dev/null
+++ b/components/ircii/patches/ircterm.h.patch
@@ -0,0 +1,32 @@
+Needed to get ircii to successfully run in 64-bit mode with Solaris
+libtermcap (really libcurses). Also need to have -DINCLUDE_CURSES_H
+defined in the component Makefile.
+
+This patch has not been sent upstream, because the Solaris integration
+of termcap diverges from the way that Linux systems do this.
+
+On Linux systems you do not need to have -DINCLUDE_CURSES_H defined, in
+order to build ircii. The tgoto() routine has a prototype definition in
+/usr/include/termcap.h (supplied by the ncurses package), which is
+found by configure:
+
+...
+checking for termcap.h... yes
+...
+
+On Solaris, we do not have a /usr/include/termcap.h file. Therefore,
+according to the curs_termcap(3CURSES) man page, for C sources files
+that want to use the tgoto() routine, we need to include both
+"#include <curses.h" and "#include <term.h>". For that we need to define
+-DINCLUDE_CURSES_H and also patch it to include term.h
+
+--- ircii-20111115/include/ircterm.h.orig 2013-05-09 14:53:15.390715728 -0700
++++ ircii-20111115/include/ircterm.h 2013-05-09 14:53:37.227217484 -0700
+@@ -39,6 +39,7 @@
+
+ #ifdef INCLUDE_CURSES_H
+ # include <curses.h>
++# include <term.h>
+ #endif /* INCLUDE_CURSES_H */
+
+ extern int term_reset_flag;
diff --git a/components/libarchive/Makefile b/components/libarchive/Makefile
new file mode 100644
index 0000000..e2e0541
--- /dev/null
+++ b/components/libarchive/Makefile
@@ -0,0 +1,64 @@
+#
+# 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 (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME= libarchive
+COMPONENT_VERSION= 3.0.4
+COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_PROJECT_URL= http://github.com/
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+ sha256:76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac
+COMPONENT_ARCHIVE_URL= \
+ $(COMPONENT_PROJECT_URL)downloads/libarchive/libarchive/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB= library/libarchive
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+# Userland default includes -mt which links with libthread which we don't need.
+studio_MT =
+
+# libarchive's Makefile hard-codes some gcc-only flags in COMMON_CFLAGS, then
+# appends CFLAGS to that. Reset the former here so we can build with Studio.
+COMPONENT_BUILD_ARGS += COMMON_CFLAGS=''
+COMPONENT_BUILD_ARGS += CFLAGS="$(CFLAGS)"
+COMPONENT_TEST_ARGS += COMMON_CFLAGS=''
+COMPONENT_TEST_ARGS += CFLAGS="$(CFLAGS)"
+
+# We need GNU awk for the following to work; hence the PATH tweak.
+COMPONENT_PREP_ACTION = \
+ (cd $(@D)/doc/man ; rm *.[135] ; env PATH=/usr/gnu/bin:$$PATH gmake all)
+PKG_PROTO_DIRS += $(COMPONENT_SRC)/doc/man
+
+# common targets
+build: $(BUILD_32_and_64)
+
+install: $(INSTALL_32_and_64)
+
+test: $(TEST_32_and_64)
+
+BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk
diff --git a/components/libarchive/libarchive.license b/components/libarchive/libarchive.license
new file mode 100644
index 0000000..a328e97
--- /dev/null
+++ b/components/libarchive/libarchive.license
@@ -0,0 +1,150 @@
+The libarchive distribution as a whole is Copyright by Tim Kientzle
+and is subject to the copyright notice reproduced at the bottom of
+this file.
+
+Each individual file in this distribution should have a clear
+copyright/licensing statement at the beginning of the file. If any do
+not, please let me know and I will rectify it. The following is
+intended to summarize the copyright status of the individual files;
+the actual statements in the files are controlling.
+
+* Except as listed below, all C sources (including .c and .h files)
+ and documentation files are subject to the copyright notice reproduced
+ at the bottom of this file.
+
+* The following source files are also subject in whole or in part to
+ a 3-clause UC Regents copyright; please read the individual source
+ files for details:
+ libarchive/archive_entry.c
+ libarchive/archive_read_support_filter_compress.c
+ libarchive/archive_write_set_filter_compress.c
+ libarchive/mtree.5
+ tar/matching.c
+
+* The following source files are in the public domain:
+ tar/getdate.c
+
+* The build files---including Makefiles, configure scripts,
+ and auxiliary scripts used as part of the compile process---have
+ widely varying licensing terms. Please check individual files before
+ distributing them to see if those restrictions apply to you.
+
+I intend for all new source code to use the license below and hope over
+time to replace code with other licenses with new implementations that
+do use the license below. The varying licensing of the build scripts
+seems to be an unavoidable mess.
+
+
+Copyright (c) 2003-2009 <author(s)>
+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
+ in this position and unchanged.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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.
+
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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 code borrows heavily from "compress" source code, which is
+ * protected by the following copyright. (Clause 3 dropped by request
+ * of the Regents.)
+ */
+
+/*-
+ * Copyright (c) 1985, 1986, 1992, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Diomidis Spinellis and James A. Woods, derived from original
+ * work by Spencer Thomas and Joseph Orost.
+ *
+ * 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.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS 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.
+ */
+.\" Copyright (c) 1989, 1990, 1993
+.\" The Regents of the University of California. 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.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\" may be used to endorse or promote products derived from this software
+.\" without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS 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.
diff --git a/components/libarchive/libarchive.p5m b/components/libarchive/libarchive.p5m
new file mode 100644
index 0000000..b511c66
--- /dev/null
+++ b/components/libarchive/libarchive.p5m
@@ -0,0 +1,70 @@
+#
+# 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 (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability Uncommitted>
+# All man pages are pulled from $(COMPONENT_SRC)/doc/man and have a .3 suffix
+<transform file path=usr.*/man/man.+/(.+[.]3).*$ -> set action.hash %<\1> >
+set name=pkg.fmri \
+ value=pkg:/library/libarchive@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="multi-format archive and compression library"
+set name=pkg.description \
+ value="The libarchive(3LIB) library provides a flexible interface for reading and writing archives in various formats such as tar(1) and cpio(1). libarchive also supports reading and writing archives compressed using various compression filters such as gzip(1) and bzip2(1). The library is inherently stream-oriented; readers serially iterate through the archive, writers serially add things to the archive."
+set name=com.oracle.info.description \
+ value="multi-format archive and compression library"
+set name=com.oracle.info.tpno value=11624
+set name=info.classification \
+ value=org.opensolaris.category.2008:System/Libraries
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Tim Kientzle <kientzle@acm.org>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2012/356
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/include/archive.h
+file path=usr/include/archive_entry.h
+link path=usr/lib/$(MACH64)/libarchive.so target=libarchive.so.12.0.4
+link path=usr/lib/$(MACH64)/libarchive.so.12 target=libarchive.so.12.0.4
+file path=usr/lib/$(MACH64)/libarchive.so.12.0.4
+file path=usr/lib/$(MACH64)/pkgconfig/libarchive.pc
+link path=usr/lib/libarchive.so target=libarchive.so.12
+link path=usr/lib/libarchive.so.12 target=libarchive.so.12.0.4
+file path=usr/lib/libarchive.so.12.0.4
+file path=usr/lib/pkgconfig/libarchive.pc
+file path=usr/share/man/man3archive/archive_entry.3archive
+file path=usr/share/man/man3archive/archive_entry_acl.3archive
+file path=usr/share/man/man3archive/archive_entry_linkify.3archive
+file path=usr/share/man/man3archive/archive_entry_paths.3archive
+file path=usr/share/man/man3archive/archive_entry_perms.3archive
+file path=usr/share/man/man3archive/archive_entry_stat.3archive
+file path=usr/share/man/man3archive/archive_entry_time.3archive
+file path=usr/share/man/man3archive/archive_read.3archive
+file path=usr/share/man/man3archive/archive_read_disk.3archive
+file path=usr/share/man/man3archive/archive_read_set_options.3archive
+file path=usr/share/man/man3archive/archive_util.3archive
+file path=usr/share/man/man3archive/archive_write.3archive
+file path=usr/share/man/man3archive/archive_write_disk.3archive
+file path=usr/share/man/man3archive/archive_write_set_options.3archive
+file path=usr/share/man/man3lib/libarchive.3lib
+file libarchive-formats.5 path=usr/share/man/man4/libarchive-formats.4
+license libarchive.license license=BSD-like
diff --git a/components/libarchive/patches/archive_string.c.patch b/components/libarchive/patches/archive_string.c.patch
new file mode 100644
index 0000000..c705709
--- /dev/null
+++ b/components/libarchive/patches/archive_string.c.patch
@@ -0,0 +1,17 @@
+This patch was fed back to the upstream community:
+http://code.google.com/p/libarchive/issues/detail?id=288
+Given the response "This issue has been already fixed in master branch."
+it should no longer be needed with the next release.
+
+--- libarchive/libarchive/archive_string.c.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_string.c Tue Nov 27 18:10:35 2012
+@@ -1120,8 +1120,8 @@
+ }
+ sc->to_charset = strdup(tc);
+ if (sc->to_charset == NULL) {
+- free(sc);
+ free(sc->from_charset);
++ free(sc);
+ return (NULL);
+ }
+ archive_string_init(&sc->utftmp);
diff --git a/components/libarchive/patches/archive_write_set_format_ar.c.patch b/components/libarchive/patches/archive_write_set_format_ar.c.patch
new file mode 100644
index 0000000..045a082
--- /dev/null
+++ b/components/libarchive/patches/archive_write_set_format_ar.c.patch
@@ -0,0 +1,16 @@
+This patch was fed back to the upstream community:
+http://code.google.com/p/libarchive/issues/detail?id=287
+Given the response "I just committed your patch.", it should
+no longer be needed with the next release.
+
+--- libarchive/libarchive/archive_write_set_format_ar.c.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_write_set_format_ar.c Tue Nov 27 17:48:04 2012
+@@ -165,7 +165,7 @@
+ * Reject files with empty name.
+ */
+ pathname = archive_entry_pathname(entry);
+- if (*pathname == '\0') {
++ if (pathname == NULL || *pathname == '\0') {
+ archive_set_error(&a->archive, EINVAL,
+ "Invalid filename");
+ return (ARCHIVE_WARN);
diff --git a/components/libarchive/patches/archive_write_set_format_pax.c.patch b/components/libarchive/patches/archive_write_set_format_pax.c.patch
new file mode 100644
index 0000000..03f6aa5
--- /dev/null
+++ b/components/libarchive/patches/archive_write_set_format_pax.c.patch
@@ -0,0 +1,27 @@
+A less complete version of this patch was fed back to the upstream community:
+http://code.google.com/p/libarchive/issues/detail?id=285
+This more complete patch was committed instead. It should no longer be
+needed with the next release.
+
+--- libarchive/libarchive/archive_write_set_format_pax.c.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_write_set_format_pax.c Sun Dec 2 04:03:38 2012
+@@ -647,8 +647,10 @@ archive_write_pax_header(struct archive_write *a,
+ oname = archive_entry_pathname(entry_original);
+ name_length = strlen(oname);
+ name = malloc(name_length + 3);
+- if (name == NULL) {
++ if (name == NULL || extra == NULL) {
+ /* XXX error message */
++ archive_entry_free(extra);
++ free(name);
+ return (ARCHIVE_FAILED);
+ }
+ strcpy(name, oname);
+@@ -687,6 +689,7 @@ archive_write_pax_header(struct archive_write *a,
+
+ /* Recurse to write the special copyfile entry. */
+ r = archive_write_pax_header(a, extra);
++ archive_entry_free(extra);
+ if (r < ARCHIVE_WARN)
+ return (r);
+ if (r < ret)
diff --git a/components/libarchive/patches/archive_write_set_format_zip.c.patch b/components/libarchive/patches/archive_write_set_format_zip.c.patch
new file mode 100644
index 0000000..10ee2cd
--- /dev/null
+++ b/components/libarchive/patches/archive_write_set_format_zip.c.patch
@@ -0,0 +1,16 @@
+This patch was fed back to the upstream community:
+http://code.google.com/p/libarchive/issues/detail?id=286
+Given the response "I applied your patch to zip writer."
+it should no longer be needed with the next release.
+
+--- libarchive/libarchive/archive_write_set_format_zip.c.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_write_set_format_zip.c Tue Nov 27 17:31:42 2012
+@@ -842,6 +842,8 @@
+ type = archive_entry_filetype(entry);
+ path = archive_entry_pathname(entry);
+
++ if (path == NULL)
++ return (0);
+ if ((type == AE_IFDIR) & (path[strlen(path) - 1] != '/')) {
+ return strlen(path) + 1;
+ } else {
diff --git a/components/libarchive/patches/libarchive-archive_entry.3.patch b/components/libarchive/patches/libarchive-archive_entry.3.patch
new file mode 100644
index 0000000..c83707c
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_entry.3.patch
@@ -0,0 +1,65 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_entry.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_entry.3 Fri Nov 9 12:39:50 2012
+@@ -26,7 +26,7 @@
+ .\" $FreeBSD$
+ .\"
+ .Dd Feburary 2, 2012
+-.Dt ARCHIVE_ENTRY 3
++.Dt ARCHIVE_ENTRY 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_entry_clear ,
+@@ -57,7 +57,7 @@
+ .Tn struct stat
+ plus associated pathname, textual group and user names, etc.
+ These objects are used by
+-.Xr libarchive 3
++.Xr libarchive 3LIB
+ to represent the metadata associated with a particular
+ entry in an archive.
+ .Ss Create and Destroy
+@@ -84,17 +84,17 @@
+ .Ss Function groups
+ Due to high number of functions, the accessor functions can be found in
+ man pages grouped by the purpose.
+-.Bl -tag -width ".Xr archive_entry_perms 3"
+-.It Xr archive_entry_acl 3
++.Bl -tag -width ".Xr archive_entry_perms 3ARCHIVE"
++.It Xr archive_entry_acl 3ARCHIVE
+ Access Control List manipulation
+-.It Xr archive_entry_paths 3
++.It Xr archive_entry_paths 3ARCHIVE
+ Path name manipulation
+-.It Xr archive_entry_perms 3
++.It Xr archive_entry_perms 3ARCHIVE
+ User, group and mode manipulation
+-.It Xr archive_entry_stat 3
++.It Xr archive_entry_stat 3ARCHIVE
+ Functions not in the other groups and copying to/from
+ .Vt struct stat .
+-.It Xr archive_entry_time 3
++.It Xr archive_entry_time 3ARCHIVE
+ Time field manipulation
+ .El
+ .Pp
+@@ -131,11 +131,11 @@
+ .\" .Sh RETURN VALUES
+ .\" .Sh ERRORS
+ .Sh SEE ALSO
+-.Xr archive 3 ,
+-.Xr archive_entry_acl 3 ,
+-.Xr archive_entry_paths 3 ,
+-.Xr archive_entry_perms 3 ,
+-.Xr archive_entry_time 3
++.Xr libarchive 3LIB ,
++.Xr archive_entry_acl 3ARCHIVE ,
++.Xr archive_entry_paths 3ARCHIVE ,
++.Xr archive_entry_perms 3ARCHIVE ,
++.Xr archive_entry_time 3ARCHIVE
+ .Sh HISTORY
+ The
+ .Nm libarchive
diff --git a/components/libarchive/patches/libarchive-archive_entry_acl.3.patch b/components/libarchive/patches/libarchive-archive_entry_acl.3.patch
new file mode 100644
index 0000000..8a0f0e5
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_entry_acl.3.patch
@@ -0,0 +1,35 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_entry_acl.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_entry_acl.3 Fri Nov 9 12:39:06 2012
+@@ -23,7 +23,7 @@
+ .\" SUCH DAMAGE.
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_ENTRY_ACL 3
++.Dt ARCHIVE_ENTRY_ACL 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_entry_acl_add_entry ,
+@@ -173,7 +173,7 @@
+ .Fn archive_entry_acl_next_w .
+ The function returns either 0, if no non-extended ACLs are found.
+ In this case, the access permissions should be obtained by
+-.Xr archive_entry_mode 3
++.Xr archive_entry_mode 3ARCHIVE
+ or set using
+ .Xr chmod 2 .
+ Otherwise, the function returns the same value as
+@@ -226,8 +226,8 @@
+ or
+ .Fn archive_entry_acl_text_w .
+ .Sh SEE ALSO
+-.Xr archive 3 ,
+-.Xr archive_entry 3
++.Xr libarchive 3LIB ,
++.Xr archive_entry 3ARCHIVE
+ .Sh BUGS
+ .Dv ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID
+ and
diff --git a/components/libarchive/patches/libarchive-archive_entry_linkify.3.patch b/components/libarchive/patches/libarchive-archive_entry_linkify.3.patch
new file mode 100644
index 0000000..2adb2d2
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_entry_linkify.3.patch
@@ -0,0 +1,34 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_entry_linkify.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_entry_linkify.3 Fri Nov 9 12:38:22 2012
+@@ -23,7 +23,7 @@
+ .\" SUCH DAMAGE.
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_ENTRY_LINKIFY 3
++.Dt ARCHIVE_ENTRY_LINKIFY 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_entry_linkresolver ,
+@@ -91,7 +91,7 @@
+ .Fn archive_entry_linkresolver_set_strategy
+ function selects the optimal hardlink strategy for the given format.
+ The format code can be obtained from
+-.Xr archive_format 3 .
++.Xr archive_format 3ARCHIVE .
+ The function can be called more than once, but it is recommended to
+ flush all deferred entries first.
+ .Pp
+@@ -218,7 +218,7 @@
+ returns
+ .Dv NULL
+ on
+-.Xr malloc 3
++.Xr malloc 3C
+ failures.
+ .Sh SEE ALSO
+-.Xr archive_entry 3
++.Xr archive_entry 3ARCHIVE
diff --git a/components/libarchive/patches/libarchive-archive_entry_paths.3.patch b/components/libarchive/patches/libarchive-archive_entry_paths.3.patch
new file mode 100644
index 0000000..01ba016
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_entry_paths.3.patch
@@ -0,0 +1,41 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_entry_paths.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_entry_paths.3 Fri Nov 9 12:37:42 2012
+@@ -23,7 +23,7 @@
+ .\" SUCH DAMAGE.
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_ENTRY_PATHS 3
++.Dt ARCHIVE_ENTRY_PATHS 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_entry_hardlink ,
+@@ -105,7 +105,7 @@
+ .Fn archive_entry_update_symlink_utf8 "struct archive_entry *a" "const char *path"
+ .Sh DESCRIPTION
+ Path names supported by
+-.Xr archive_entry 3 :
++.Xr archive_entry 3ARCHIVE :
+ .Bl -tag -width "sourcepath" -compact
+ .It hardlink
+ Destination of the hardlink.
+@@ -118,7 +118,7 @@
+ Path in the archive
+ .It sourcepath
+ Path on the disk for use by
+-.Xr archive_read_disk 3 .
++.Xr archive_read_disk 3ARCHIVE .
+ .It symlink
+ Destination of the symbolic link.
+ .El
+@@ -149,5 +149,5 @@
+ is an alias for
+ .Fn archive_entry_copy_XXX .
+ .Sh SEE ALSO
+-.Xr archive 3 ,
+-.Xr archive_entry 3
++.Xr libarchive 3LIB ,
++.Xr archive_entry 3ARCHIVE
diff --git a/components/libarchive/patches/libarchive-archive_entry_perms.3.patch b/components/libarchive/patches/libarchive-archive_entry_perms.3.patch
new file mode 100644
index 0000000..c0d57b8
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_entry_perms.3.patch
@@ -0,0 +1,46 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_entry_perms.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_entry_perms.3 Fri Nov 9 12:37:14 2012
+@@ -24,7 +24,7 @@
+ .\" SUCH DAMAGE.
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_ENTRY_PERMS 3
++.Dt ARCHIVE_ENTRY_PERMS 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_entry_gid ,
+@@ -170,9 +170,6 @@
+ In unusual circumstances, you can force a fully-specified set
+ of file flags by setting the bitmap of flags to clear to the complement
+ of the bitmap of flags to set.
+-(This differs from
+-.Xr fflagstostr 3 ,
+-which only includes names for set bits.)
+ Converting a bitmap to a textual string is a platform-specific
+ operation; bits that are not meaningful on the current platform
+ will be ignored.
+@@ -190,15 +187,12 @@
+ Note that every name \(em including names that follow an unrecognized
+ name \(em will be evaluated, and the bitmaps will be set to reflect
+ every name that is recognized.
+-(In particular, this differs from
+-.Xr strtofflags 3 ,
+-which stops parsing at the first unrecognized name.)
+ .Sh SEE ALSO
+-.Xr archive 3 ,
+-.Xr archive_entry 3 ,
+-.Xr archive_entry_acl 3 ,
+-.Xr archive_read_disk 3 ,
+-.Xr archive_write_disk 3
++.Xr libarchive 3LIB ,
++.Xr archive_entry 3ARCHIVE ,
++.Xr archive_entry_acl 3ARCHIVE ,
++.Xr archive_read_disk 3ARCHIVE ,
++.Xr archive_write_disk 3ARCHIVE
+ .Sh BUGS
+ The platform types
+ .Vt uid_t
diff --git a/components/libarchive/patches/libarchive-archive_entry_stat.3.patch b/components/libarchive/patches/libarchive-archive_entry_stat.3.patch
new file mode 100644
index 0000000..82cba96
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_entry_stat.3.patch
@@ -0,0 +1,37 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_entry_stat.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_entry_stat.3 Fri Nov 9 12:41:56 2012
+@@ -23,7 +23,7 @@
+ .\" SUCH DAMAGE.
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_ENTRY_STAT 3
++.Dt ARCHIVE_ENTRY_STAT 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_entry_stat ,
+@@ -224,7 +224,7 @@
+ and
+ .Fn archive_entry_ino64
+ are used by
+-.Xr archive_entry_linkify 3
++.Xr archive_entry_linkify 3ARCHIVE
+ to find hardlinks.
+ The pair of device and inode is suppossed to identify hardlinked files.
+ .Pp
+@@ -267,8 +267,8 @@
+ Some archive formats use the combined form, while other formats use
+ the split form.
+ .Sh SEE ALSO
+-.Xr archive 3 ,
+-.Xr archive_entry_acl 3 ,
+-.Xr archive_entry_perms 3 ,
+-.Xr archive_entry_time 3 ,
++.Xr libarchive 3LIB ,
++.Xr archive_entry_acl 3ARCHIVE ,
++.Xr archive_entry_perms 3ARCHIVE ,
++.Xr archive_entry_time 3ARCHIVE ,
+ .Xr stat 2
diff --git a/components/libarchive/patches/libarchive-archive_entry_time.3.patch b/components/libarchive/patches/libarchive-archive_entry_time.3.patch
new file mode 100644
index 0000000..e09f64d
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_entry_time.3.patch
@@ -0,0 +1,35 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_entry_time.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_entry_time.3 Fri Nov 9 12:36:07 2012
+@@ -26,7 +26,7 @@
+ .\" $FreeBSD$
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_ENTRY_TIME 3
++.Dt ARCHIVE_ENTRY_TIME 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_entry_atime ,
+@@ -100,7 +100,7 @@
+ Supported time fields are atime (access time), birthtime (creation time),
+ ctime (last time an inode property was changed) and mtime (modification time).
+ .Pp
+-.Xr libarchive 3
++.Xr libarchive 3LIB
+ provides a high-resolution interface.
+ The timestamps are truncated automatically depending on the archive format
+ (for archiving) or the filesystem capabilities (for restoring).
+@@ -113,8 +113,8 @@
+ .Fn XXX_is_set .
+ Unset time fields have a second and nanosecond field of 0.
+ .Sh SEE ALSO
+-.Xr archive 3 ,
+-.Xr archive_entry 3
++.Xr libarchive 3LIB ,
++.Xr archive_entry 3ARCHIVE
+ .Sh HISTORY
+ The
+ .Nm libarchive
diff --git a/components/libarchive/patches/libarchive-archive_read.3.patch b/components/libarchive/patches/libarchive-archive_read.3.patch
new file mode 100644
index 0000000..4f4ab12
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_read.3.patch
@@ -0,0 +1,101 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_read.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_read.3 Fri Nov 9 12:42:17 2012
+@@ -25,7 +25,7 @@
+ .\" $FreeBSD$
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_READ 3
++.Dt ARCHIVE_READ 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_read
+@@ -44,7 +44,7 @@
+ .\"
+ .Ss Create archive object
+ See
+-.Xr archive_read_new 3 .
++.Xr archive_read_new 3ARCHIVE .
+ .Pp
+ To read an archive, you must first obtain an initialized
+ .Tn struct archive
+@@ -53,9 +53,9 @@
+ .\"
+ .Ss Enable filters and formats
+ See
+-.Xr archive_read_filter 3
++.Xr archive_read_filter 3ARCHIVE
+ and
+-.Xr archive_read_format 3 .
++.Xr archive_read_format 3ARCHIVE .
+ .Pp
+ You can then modify this object for the desired operations with the
+ various
+@@ -80,11 +80,11 @@
+ .\"
+ .Ss Set options
+ See
+-.Xr archive_read_set_options 3 .
++.Xr archive_read_set_options 3ARCHIVE .
+ .\"
+ .Ss Open archive
+ See
+-.Xr archive_read_open 3 .
++.Xr archive_read_open 3ARCHIVE .
+ .Pp
+ Once you have prepared the
+ .Tn struct archive
+@@ -105,10 +105,10 @@
+ .\"
+ .Ss Consume archive
+ See
+-.Xr archive_read_header 3 ,
+-.Xr archive_read_data 3
++.Xr archive_read_header 3ARCHIVE ,
++.Xr archive_read_data 3ARCHIVE
+ and
+-.Xr archive_read_extract 3 .
++.Xr archive_read_extract 3ARCHIVE .
+ .Pp
+ Each archive entry consists of a header followed by a certain
+ amount of data.
+@@ -146,7 +146,7 @@
+ .\"
+ .Ss Release resources
+ See
+-.Xr archive_read_free 3 .
++.Xr archive_read_free 3ARCHIVE .
+ .Pp
+ Once you have finished reading data from the archive, you
+ should call
+@@ -217,17 +217,16 @@
+ .\" .Sh ERRORS
+ .Sh SEE ALSO
+ .Xr tar 1 ,
+-.Xr libarchive 3 ,
+-.Xr archive_read_new 3 ,
+-.Xr archive_read_data 3 ,
+-.Xr archive_read_extract 3 ,
+-.Xr archive_read_filter 3 ,
+-.Xr archive_read_format 3 ,
+-.Xr archive_read_header 3 ,
+-.Xr archive_read_open 3 ,
+-.Xr archive_read_set_options 3 ,
+-.Xr archive_util 3 ,
+-.Xr tar 5
++.Xr libarchive 3LIB ,
++.Xr archive_read_new 3ARCHIVE ,
++.Xr archive_read_data 3ARCHIVE ,
++.Xr archive_read_extract 3ARCHIVE ,
++.Xr archive_read_filter 3ARCHIVE ,
++.Xr archive_read_format 3ARCHIVE ,
++.Xr archive_read_header 3ARCHIVE ,
++.Xr archive_read_open 3ARCHIVE ,
++.Xr archive_read_set_options 3ARCHIVE ,
++.Xr archive_util 3ARCHIVE
+ .Sh HISTORY
+ The
+ .Nm libarchive
diff --git a/components/libarchive/patches/libarchive-archive_read_disk.3.patch b/components/libarchive/patches/libarchive-archive_read_disk.3.patch
new file mode 100644
index 0000000..67733e6
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_read_disk.3.patch
@@ -0,0 +1,93 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_read_disk.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_read_disk.3 Fri Nov 9 12:35:02 2012
+@@ -25,7 +25,7 @@
+ .\" $FreeBSD$
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_READ_DISK 3
++.Dt ARCHIVE_READ_DISK 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_read_disk_new ,
+@@ -138,16 +138,16 @@
+ This convenience function installs a standard set of user
+ and group name lookup functions.
+ These functions use
+-.Xr getpwuid 3
++.Xr getpwuid 3C
+ and
+-.Xr getgrgid 3
++.Xr getgrgid 3C
+ to convert ids to names, defaulting to NULL if the names cannot
+ be looked up.
+ These functions also implement a simple memory cache to reduce
+ the number of calls to
+-.Xr getpwuid 3
++.Xr getpwuid 3C
+ and
+-.Xr getgrgid 3 .
++.Xr getgrgid 3C .
+ .It Fn archive_read_disk_entry_from_file
+ Populates a
+ .Tn struct archive_entry
+@@ -155,7 +155,7 @@
+ The
+ .Tn archive_entry
+ object must have already been created with
+-.Xr archive_entry_new 3
++.Xr archive_entry_new 3ARCHIVE
+ and at least one of the source path or path fields must already be set.
+ (If both are set, the source path will be used.)
+ .Pp
+@@ -196,7 +196,7 @@
+ More information about the
+ .Va struct archive
+ object and the overall design of the library can be found in the
+-.Xr libarchive 3
++.Xr libarchive 3LIB
+ overview.
+ .Sh EXAMPLE
+ The following illustrates basic usage of the library by
+@@ -263,12 +263,12 @@
+ functions.
+ .\"
+ .Sh SEE ALSO
+-.Xr archive_read 3 ,
+-.Xr archive_util 3 ,
+-.Xr archive_write 3 ,
+-.Xr archive_write_disk 3 ,
++.Xr archive_read 3ARCHIVE ,
++.Xr archive_util 3ARCHIVE ,
++.Xr archive_write 3ARCHIVE ,
++.Xr archive_write_disk 3ARCHIVE ,
+ .Xr tar 1 ,
+-.Xr libarchive 3
++.Xr libarchive 3LIB
+ .Sh HISTORY
+ The
+ .Nm libarchive
+@@ -290,9 +290,9 @@
+ The
+ .Dq standard
+ user name and group name lookup functions are not the defaults because
+-.Xr getgrgid 3
++.Xr getgrgid 3C
+ and
+-.Xr getpwuid 3
++.Xr getpwuid 3C
+ are sometimes too large for particular applications.
+ The current design allows the application author to use a more
+ compact implementation when appropriate.
+@@ -310,7 +310,7 @@
+ .Pp
+ This API should provide a set of methods for walking a directory tree.
+ That would make it a direct parallel of the
+-.Xr archive_read 3
++.Xr archive_read 3ARCHIVE
+ API.
+ When such methods are implemented, the
+ .Dq hybrid
diff --git a/components/libarchive/patches/libarchive-archive_read_set_options.3.patch b/components/libarchive/patches/libarchive-archive_read_set_options.3.patch
new file mode 100644
index 0000000..723331d
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_read_set_options.3.patch
@@ -0,0 +1,25 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_read_set_options.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_read_set_options.3 Fri Nov 9 12:28:47 2012
+@@ -25,7 +25,7 @@
+ .\" $FreeBSD$
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_READ_OPTIONS 3
++.Dt ARCHIVE_READ_OPTIONS 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_read_set_filter_option ,
+@@ -204,6 +204,6 @@
+ .\"
+ .Sh SEE ALSO
+ .Xr tar 1 ,
+-.Xr libarchive 3 ,
+-.Xr archive_write_set_options 3 ,
+-.Xr archive_read 3
++.Xr libarchive 3LIB ,
++.Xr archive_write_set_options 3ARCHIVE ,
++.Xr archive_read 3ARCHIVE
diff --git a/components/libarchive/patches/libarchive-archive_util.3.patch b/components/libarchive/patches/libarchive-archive_util.3.patch
new file mode 100644
index 0000000..78ebcc3
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_util.3.patch
@@ -0,0 +1,56 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_util.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_util.3 Fri Nov 9 12:34:22 2012
+@@ -25,7 +25,7 @@
+ .\" $FreeBSD$
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_UTIL 3
++.Dt ARCHIVE_UTIL 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_clear_error ,
+@@ -84,7 +84,7 @@
+ These functions provide access to various information about the
+ .Tn struct archive
+ object used in the
+-.Xr libarchive 3
++.Xr libarchive 3LIB
+ library.
+ .Bl -tag -compact -width indent
+ .It Fn archive_clear_error
+@@ -112,13 +112,13 @@
+ obtained from passing the result of
+ .Fn archive_errno
+ to
+-.Xr strerror 3 .
++.Xr strerror 3C .
+ .It Fn archive_file_count
+ Returns a count of the number of files processed by this archive object.
+ The count is incremented by calls to
+-.Xr archive_write_header 3
++.Xr archive_write_header 3ARCHIVE
+ or
+-.Xr archive_read_next_header 3 .
++.Xr archive_read_next_header 3ARCHIVE .
+ .It Fn archive_filter_code
+ Returns a numeric code identifying the indicated filter.
+ See
+@@ -207,10 +207,10 @@
+ not uniformly supported and should not be used.
+ .El
+ .Sh SEE ALSO
+-.Xr archive_read 3 ,
+-.Xr archive_write 3 ,
+-.Xr libarchive 3 ,
+-.Xr printf 3
++.Xr archive_read 3ARCHIVE ,
++.Xr archive_write 3ARCHIVE ,
++.Xr libarchive 3LIB ,
++.Xr printf 3C
+ .Sh HISTORY
+ The
+ .Nm libarchive
diff --git a/components/libarchive/patches/libarchive-archive_write.3.patch b/components/libarchive/patches/libarchive-archive_write.3.patch
new file mode 100644
index 0000000..b62cb12
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_write.3.patch
@@ -0,0 +1,87 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_write.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_write.3 Fri Nov 9 12:24:57 2012
+@@ -25,7 +25,7 @@
+ .\" $FreeBSD$
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_WRITE 3
++.Dt ARCHIVE_WRITE 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_write
+@@ -44,7 +44,7 @@
+ .\"
+ .Ss Create archive object
+ See
+-.Xr archive_write_new 3 .
++.Xr archive_write_new 3ARCHIVE .
+ .Pp
+ To write an archive, you must first obtain an initialized
+ .Tn struct archive
+@@ -53,10 +53,10 @@
+ .\"
+ .Ss Enable filters and formats, configure block size and padding
+ See
+-.Xr archive_write_filter 3 ,
+-.Xr archive_write_format 3
++.Xr archive_write_filter 3ARCHIVE ,
++.Xr archive_write_format 3ARCHIVE
+ and
+-.Xr archive_write_blocksize 3 .
++.Xr archive_write_blocksize 3ARCHIVE .
+ .Pp
+ You can then modify this object for the desired operations with the
+ various
+@@ -71,11 +71,11 @@
+ .\"
+ .Ss Set options
+ See
+-.Xr archive_read_set_options 3 .
++.Xr archive_read_set_options 3ARCHIVE .
+ .\"
+ .Ss Open archive
+ See
+-.Xr archive_write_open 3 .
++.Xr archive_write_open 3ARCHIVE .
+ .Pp
+ Once you have prepared the
+ .Tn struct archive
+@@ -92,9 +92,9 @@
+ .\"
+ .Ss Produce archive
+ See
+-.Xr archive_write_header 3
++.Xr archive_write_header 3ARCHIVE
+ and
+-.Xr archive_write_data 3 .
++.Xr archive_write_data 3ARCHIVE .
+ .Pp
+ Individual archive entries are written in a three-step
+ process:
+@@ -112,7 +112,7 @@
+ .\"
+ .Ss Release resources
+ See
+-.Xr archive_write_free 3 .
++.Xr archive_write_free 3ARCHIVE .
+ .Pp
+ After all entries have been written, use the
+ .Fn archive_write_free
+@@ -220,11 +220,8 @@
+ .Ed
+ .Sh SEE ALSO
+ .Xr tar 1 ,
+-.Xr libarchive 3 ,
+-.Xr archive_write_set_options 3 ,
+-.Xr cpio 5 ,
+-.Xr mtree 5 ,
+-.Xr tar 5
++.Xr libarchive 3LIB ,
++.Xr archive_write_set_options 3ARCHIVE
+ .Sh HISTORY
+ The
+ .Nm libarchive
diff --git a/components/libarchive/patches/libarchive-archive_write_disk.3.patch b/components/libarchive/patches/libarchive-archive_write_disk.3.patch
new file mode 100644
index 0000000..e6c8145
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_write_disk.3.patch
@@ -0,0 +1,82 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_write_disk.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_write_disk.3 Fri Nov 9 12:33:36 2012
+@@ -25,7 +25,7 @@
+ .\" $FreeBSD$
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_WRITE_DISK 3
++.Dt ARCHIVE_WRITE_DISK 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_write_disk_new ,
+@@ -207,22 +207,22 @@
+ This convenience function installs a standard set of user
+ and group lookup functions.
+ These functions use
+-.Xr getpwnam 3
++.Xr getpwnam 3C
+ and
+-.Xr getgrnam 3
++.Xr getgrnam 3C
+ to convert names to ids, defaulting to the ids if the names cannot
+ be looked up.
+ These functions also implement a simple memory cache to reduce
+ the number of calls to
+-.Xr getpwnam 3
++.Xr getpwnam 3C
+ and
+-.Xr getgrnam 3 .
++.Xr getgrnam 3C .
+ .It Fn archive_write_header
+ Build and write a header using the data in the provided
+ .Tn struct archive_entry
+ structure.
+ See
+-.Xr archive_entry 3
++.Xr archive_entry 3ARCHIVE
+ for information on creating and populating
+ .Tn struct archive_entry
+ objects.
+@@ -275,10 +275,10 @@
+ More information about the
+ .Va struct archive
+ object and the overall design of the library can be found in the
+-.Xr libarchive 3
++.Xr libarchive 3LIB
+ overview.
+ Many of these functions are also documented under
+-.Xr archive_write 3 .
++.Xr archive_write 3ARCHIVE .
+ .Sh RETURN VALUES
+ Most functions return
+ .Cm ARCHIVE_OK
+@@ -311,10 +311,10 @@
+ functions.
+ .\"
+ .Sh SEE ALSO
+-.Xr archive_read 3 ,
+-.Xr archive_write 3 ,
++.Xr archive_read 3ARCHIVE ,
++.Xr archive_write 3ARCHIVE ,
+ .Xr tar 1 ,
+-.Xr libarchive 3
++.Xr libarchive 3LIB
+ .Sh HISTORY
+ The
+ .Nm libarchive
+@@ -390,9 +390,9 @@
+ The
+ .Dq standard
+ user-id and group-id lookup functions are not the defaults because
+-.Xr getgrnam 3
++.Xr getgrnam 3C
+ and
+-.Xr getpwnam 3
++.Xr getpwnam 3C
+ are sometimes too large for particular applications.
+ The current design allows the application author to use a more
+ compact implementation when appropriate.
diff --git a/components/libarchive/patches/libarchive-archive_write_set_options.3.patch b/components/libarchive/patches/libarchive-archive_write_set_options.3.patch
new file mode 100644
index 0000000..eb24528
--- /dev/null
+++ b/components/libarchive/patches/libarchive-archive_write_set_options.3.patch
@@ -0,0 +1,28 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/archive_write_set_options.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/archive_write_set_options.3 Fri Nov 9 12:25:27 2012
+@@ -25,7 +25,7 @@
+ .\" $FreeBSD$
+ .\"
+ .Dd February 2, 2012
+-.Dt ARCHIVE_WRITE_OPTIONS 3
++.Dt ARCHIVE_WRITE_OPTIONS 3ARCHIVE
+ .Os
+ .Sh NAME
+ .Nm archive_write_set_filter_option ,
+@@ -422,9 +422,9 @@
+ .\"
+ .Sh SEE ALSO
+ .Xr tar 1 ,
+-.Xr libarchive 3 ,
+-.Xr archive_read_set_options 3 ,
+-.Xr archive_write 3
++.Xr libarchive 3LIB ,
++.Xr archive_read_set_options 3ARCHIVE ,
++.Xr archive_write 3ARCHIVE
+ .Sh HISTORY
+ The
+ .Nm libarchive
diff --git a/components/libarchive/patches/libarchive-libarchive-formats.5.patch b/components/libarchive/patches/libarchive-libarchive-formats.5.patch
new file mode 100644
index 0000000..94e39d9
--- /dev/null
+++ b/components/libarchive/patches/libarchive-libarchive-formats.5.patch
@@ -0,0 +1,86 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/libarchive-formats.5.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/libarchive-formats.5 Fri Nov 9 12:32:18 2012
+@@ -25,7 +25,7 @@
+ .\" $FreeBSD$
+ .\"
+ .Dd March 18, 2012
+-.Dt LIBARCHIVE-FORMATS 5
++.Dt LIBARCHIVE-FORMATS 4
+ .Os
+ .Sh NAME
+ .Nm libarchive-formats
+@@ -32,7 +32,7 @@
+ .Nd archive formats supported by the libarchive library
+ .Sh DESCRIPTION
+ The
+-.Xr libarchive 3
++.Xr libarchive 3LIB
+ library reads and writes a variety of streaming archive formats.
+ Generally speaking, all of these archive formats consist of a series of
+ .Dq entries .
+@@ -49,7 +49,7 @@
+ functions to enable all supported formats.
+ .Ss Tar Formats
+ The
+-.Xr libarchive 3
++.Xr libarchive 3LIB
+ library can read most tar archives.
+ It can write POSIX-standard
+ .Dq ustar
+@@ -69,7 +69,7 @@
+ .Bl -tag -width indent
+ .It Cm gnutar
+ The
+-.Xr libarchive 3
++.Xr libarchive 3LIB
+ library can read most GNU-format tar archives.
+ It currently supports the most popular GNU extensions, including
+ modern long filename and linkname support, as well as atime and ctime data.
+@@ -79,12 +79,12 @@
+ formats.
+ .Pp
+ The
+-.Xr libarchive 3
++.Xr libarchive 3LIB
+ library can write GNU tar format, including long filename
+ and linkname support, as well as atime and ctime data.
+ .It Cm pax
+ The
+-.Xr libarchive 3
++.Xr libarchive 3LIB
+ library can read and write POSIX-compliant pax interchange format
+ archives.
+ Pax interchange format archives are an extension of the older ustar
+@@ -371,9 +371,7 @@
+ This can cause problems for programs such as
+ GNU ld that do not support the BSD-style long filenames.
+ .Ss mtree
+-Libarchive can read and write files in
+-.Xr mtree 5
+-format.
++Libarchive can read and write files in mtree format.
+ This format is not a true archive format, but rather a textual description
+ of a file hierarchy in which each line specifies the name of a file and
+ provides specific metadata about that file.
+@@ -384,7 +382,7 @@
+ .Tn archive_entry
+ object.
+ When writing, libarchive supports use of the
+-.Xr archive_write_set_options 3
++.Xr archive_write_set_options 3ARCHIVE
+ interface to specify which keywords should be included in the
+ output.
+ If libarchive was compiled with access to suitable
+@@ -425,7 +423,4 @@
+ .Xr shar 1 ,
+ .Xr tar 1 ,
+ .Xr zip 1 ,
+-.Xr zlib 3 ,
+-.Xr cpio 5 ,
+-.Xr mtree 5 ,
+-.Xr tar 5
++.Xr zlib 3
diff --git a/components/libarchive/patches/libarchive-libarchive.3.patch b/components/libarchive/patches/libarchive-libarchive.3.patch
new file mode 100644
index 0000000..0f047a9
--- /dev/null
+++ b/components/libarchive/patches/libarchive-libarchive.3.patch
@@ -0,0 +1,100 @@
+This patch is needed to convert BSD-style section numbers to Solaris-style
+section numbers. It has not been fed back to the upstream community. It
+may need to be tweaked slightly for future releases.
+
+--- libarchive/libarchive/libarchive.3.orig Mon Mar 26 19:49:00 2012
++++ libarchive/libarchive/libarchive.3 Fri Nov 9 12:43:07 2012
+@@ -25,7 +25,7 @@
+ .\" $FreeBSD$
+ .\"
+ .Dd March 18, 2012
+-.Dt LIBARCHIVE 3
++.Dt LIBARCHIVE 3LIB
+ .Os
+ .Sh NAME
+ .Nm libarchive
+@@ -146,21 +146,21 @@
+ .\"
+ .Sh READING AN ARCHIVE
+ See
+-.Xr libarchive_read 3 .
++.Xr libarchive_read 3ARCHIVE .
+ .\"
+ .Sh WRITING AN ARCHIVE
+ See
+-.Xr libarchive_write 3 .
++.Xr libarchive_write 3ARCHIVE .
+ .\"
+ .Sh WRITING ENTRIES TO DISK
+ The
+-.Xr archive_write_disk 3
++.Xr archive_write_disk 3ARCHIVE
+ API allows you to write
+-.Xr archive_entry 3
++.Xr archive_entry 3ARCHIVE
+ objects to disk using the same API used by
+-.Xr archive_write 3 .
++.Xr archive_write 3ARCHIVE .
+ The
+-.Xr archive_write_disk 3
++.Xr archive_write_disk 3ARCHIVE
+ API is used internally by
+ .Fn archive_read_extract ;
+ using it directly can provide greater control over how entries
+@@ -170,9 +170,9 @@
+ operations.
+ .Sh READING ENTRIES FROM DISK
+ The
+-.Xr archive_read_disk 3
++.Xr archive_read_disk 3ARCHIVE
+ supports for populating
+-.Xr archive_entry 3
++.Xr archive_entry 3ARCHIVE
+ objects from information in the filesystem.
+ This includes the information accessible from the
+ .Xr stat 2
+@@ -179,12 +179,12 @@
+ system call as well as ACLs, extended attributes,
+ and other metadata.
+ The
+-.Xr archive_read_disk 3
++.Xr archive_read_disk 3ARCHIVE
+ API also supports iterating over directory trees,
+ which allows directories of files to be read using
+ an API compatible with
+ the
+-.Xr archive_read 3
++.Xr archive_read 3ARCHIVE
+ API.
+ .Sh DESCRIPTION
+ Detailed descriptions of each function are provided by the
+@@ -199,7 +199,7 @@
+ structure contains a complete description of a single archive
+ entry.
+ It uses an opaque interface that is fully documented in
+-.Xr archive_entry 3 .
++.Xr archive_entry 3ARCHIVE .
+ .Pp
+ Users familiar with historic formats should be aware that the newer
+ variants have eliminated most restrictions on the length of textual fields.
+@@ -247,15 +247,14 @@
+ functions can be used to obtain more information.
+ .Sh ENVIRONMENT
+ There are character set conversions within the
+-.Xr archive_entry 3
++.Xr archive_entry 3ARCHIVE
+ functions that are impacted by the currently-selected locale.
+ .Sh SEE ALSO
+ .Xr tar 1 ,
+-.Xr archive_entry 3 ,
+-.Xr archive_read 3 ,
+-.Xr archive_util 3 ,
+-.Xr archive_write 3 ,
+-.Xr tar 5
++.Xr archive_entry 3ARCHIVE ,
++.Xr archive_read 3ARCHIVE ,
++.Xr archive_util 3ARCHIVE ,
++.Xr archive_write 3ARCHIVE
+ .Sh HISTORY
+ The
+ .Nm libarchive
diff --git a/components/libarchive/resolve.deps b/components/libarchive/resolve.deps
new file mode 100644
index 0000000..1c799fe
--- /dev/null
+++ b/components/libarchive/resolve.deps
@@ -0,0 +1,6 @@
+compress/bzip2
+compress/xz
+library/libxml2
+library/security/openssl
+library/zlib
+system/library
diff --git a/components/librsync/Makefile b/components/librsync/Makefile
index 721a429..e00489c 100644
--- a/components/librsync/Makefile
+++ b/components/librsync/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -63,6 +63,8 @@
PATCH_LEVEL = 1
+ASLR_MODE = $(ASLR_ENABLE)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
diff --git a/components/libsndfile/Makefile b/components/libsndfile/Makefile
index 54100fd..cdcc5c9 100644
--- a/components/libsndfile/Makefile
+++ b/components/libsndfile/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -39,6 +39,8 @@
CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)"
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32_and_64)
diff --git a/components/logilab-astng/Makefile b/components/logilab-astng/Makefile
index fa7e4a6..1ee0d0d 100644
--- a/components/logilab-astng/Makefile
+++ b/components/logilab-astng/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -41,9 +41,9 @@
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
# The tests are run using python 2.7 only and require that
# the python-27 package is installed (does not have to be the default python).
@@ -82,7 +82,7 @@
# failures: unittest_builder [2/55], unittest_lookup [1/21],
# unittest_inference [1/75]
-test: $(TEST_32)
+test: $(TEST_NO_ARCH)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
diff --git a/components/logilab-common/Makefile b/components/logilab-common/Makefile
index d03653e..da1c336 100644
--- a/components/logilab-common/Makefile
+++ b/components/logilab-common/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -42,17 +42,18 @@
# rename pytest to its versioned name; mediated links (depending on
# the python version) in the manifest will create the link from pytest
# to the correct pytest-${PYTHON_VERSION}
+# compile all of the python .py files in the proto area since setup.py doesn't
+# seem to be doing it for this component.
COMPONENT_POST_INSTALL_ACTION = \
- (cd $(PROTO_DIR)/usr/bin ; $(MV) -f pytest pytest-$(PYTHON_VERSION))
+ (cd $(PROTO_DIR)/usr/bin ; $(MV) -f pytest pytest-$(PYTHON_VERSION)) ; \
+ ($(PYTHON) -m compileall $(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES))
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
- $(PYTHON.2.6.32) -m compileall $(PROTO_DIR)/usr/lib/python2.6/vendor-packages
- $(PYTHON.2.7.32) -m compileall $(PROTO_DIR)/usr/lib/python2.7/vendor-packages
+install: $(INSTALL_NO_ARCH)
# The tests are run using python 2.7 only and require that the
# python-27 package is installed (does not have to be the default python).
@@ -72,7 +73,7 @@
# 21 modules OK (2 failed)
# failures: unittest_shellutils [1/23], unittest_date [1/45]
-test: $(TEST_32)
+test: $(TEST_NO_ARCH)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
diff --git a/components/mc/Makefile b/components/mc/Makefile
index ee86ed4..473c14f 100644
--- a/components/mc/Makefile
+++ b/components/mc/Makefile
@@ -54,9 +54,9 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
-build: $(BUILD_32)
+build: $(BUILD_64)
-install: $(INSTALL_32)
+install: $(INSTALL_64)
test: $(NO_TESTS)
diff --git a/components/mc/mc.p5m b/components/mc/mc.p5m
index ba8bd58..529a21f 100644
--- a/components/mc/mc.p5m
+++ b/components/mc/mc.p5m
@@ -35,7 +35,7 @@
set name=org.opensolaris.arc-caseid \
value=LSARC/2008/202
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/mc
+file usr/bin/$(MACH64)/mc path=usr/bin/mc
file ABOUT-NLS path=usr/share/doc/mc/ABOUT-NLS
file AUTHORS path=usr/share/doc/mc/AUTHORS
file COPYING path=usr/share/doc/mc/COPYING
diff --git a/components/open-fabrics/libibmad/patches/base.patch b/components/open-fabrics/libibmad/patches/base.patch
index 4f5ce84..d760bae 100644
--- a/components/open-fabrics/libibmad/patches/base.patch
+++ b/components/open-fabrics/libibmad/patches/base.patch
@@ -565,7 +565,38 @@
/* resolve.c */
MAD_EXPORT int ib_resolve_smlid(ib_portid_t * sm_id, int timeout) DEPRECATED;
-@@ -1036,6 +1524,10 @@
+@@ -1021,6 +1509,7 @@
+ mad_dump_linkwidth, mad_dump_linkwidthsup, mad_dump_linkwidthen,
+ mad_dump_linkdowndefstate,
+ mad_dump_linkspeed, mad_dump_linkspeedsup, mad_dump_linkspeeden,
++ mad_dump_linkspeedext, mad_dump_linkspeedextsup, mad_dump_linkspeedexten,
+ mad_dump_portstate, mad_dump_portstates,
+ mad_dump_physportstate, mad_dump_portcapmask,
+ mad_dump_mtu, mad_dump_vlcap, mad_dump_opervls,
+@@ -1029,7 +1518,21 @@
+ mad_dump_switchinfo, mad_dump_perfcounters, mad_dump_perfcounters_ext,
+ mad_dump_perfcounters_xmt_sl, mad_dump_perfcounters_rcv_sl,
+ mad_dump_perfcounters_xmt_disc, mad_dump_perfcounters_rcv_err,
+- mad_dump_portsamples_control;
++ mad_dump_portsamples_control, mad_dump_port_ext_speeds_counters,
++ mad_dump_perfcounters_port_op_rcv_counters, mad_dump_perfcounters_port_flow_ctl_counters,
++ mad_dump_perfcounters_port_vl_op_packet, mad_dump_perfcounters_port_vl_op_data,
++ mad_dump_perfcounters_port_vl_xmit_flow_ctl_update_errors, mad_dump_perfcounters_port_vl_xmit_wait_counters,
++ mad_dump_perfcounters_sw_port_vl_congestion, mad_dump_perfcounters_rcv_con_ctrl,
++ mad_dump_perfcounters_sl_rcv_fecn, mad_dump_perfcounters_sl_rcv_becn,
++ mad_dump_perfcounters_xmit_con_ctrl, mad_dump_perfcounters_vl_xmit_time_cong,
++ mad_dump_mlnx_ext_port_info, mad_dump_cc_congestioninfo, mad_dump_cc_congestionkeyinfo,
++ mad_dump_cc_congestionlog, mad_dump_cc_congestionlogswitch,
++ mad_dump_cc_congestionlogentryswitch, mad_dump_cc_congestionlogca,
++ mad_dump_cc_congestionlogentryca, mad_dump_cc_switchcongestionsetting,
++ mad_dump_cc_switchportcongestionsettingelement, mad_dump_cc_cacongestionsetting,
++ mad_dump_cc_cacongestionentry, mad_dump_cc_congestioncontroltable,
++ mad_dump_cc_congestioncontroltableentry, mad_dump_cc_timestamp,
++ mad_dump_classportinfo, mad_dump_portsamples_result;
+
+ MAD_EXPORT void mad_dump_fields(char *buf, int bufsz, void *val, int valsz,
+ int start, int end);
+@@ -1036,6 +1539,10 @@
extern MAD_EXPORT int ibdebug;
@@ -576,7 +607,7 @@
#if __BYTE_ORDER == __LITTLE_ENDIAN
#ifndef ntohll
static inline uint64_t ntohll(uint64_t x)
-@@ -1063,6 +1555,9 @@
+@@ -1063,6 +1570,9 @@
}
#endif
#endif /* __BYTE_ORDER == __BIG_ENDIAN */
@@ -586,7 +617,7 @@
/* Misc. macros: */
/** align value \a l to \a size (ceil) */
-@@ -1069,14 +1564,14 @@
+@@ -1069,14 +1579,14 @@
#define ALIGN(l, size) (((l) + ((size) - 1)) / (size) * (size))
/** printf style warning MACRO, includes name of function and pid */
@@ -621,7 +652,526 @@
diff -r -u /tmp/libibmad-1.3.7/src/fields.c libibmad-1.3.7/src/fields.c
--- /tmp/libibmad-1.3.7/src/fields.c Wed Feb 16 02:12:53 2011
+++ libibmad-1.3.7/src/fields.c Thu Feb 24 13:27:00 2011
-@@ -514,7 +514,7 @@
+@@ -452,21 +452,21 @@
+ /*
+ * PortXmitDiscardDetails fields
+ */
+- {32, 16, "PortInactiveDiscards", mad_dump_uint},
+- {48, 16, "PortNeighborMTUDiscards", mad_dump_uint},
+- {64, 16, "PortSwLifetimeLimitDiscards", mad_dump_uint},
+- {80, 16, "PortSwHOQLifetimeLimitDiscards", mad_dump_uint},
++ {BITSOFFS(32, 16), "PortInactiveDiscards", mad_dump_uint},
++ {BITSOFFS(48, 16), "PortNeighborMTUDiscards", mad_dump_uint},
++ {BITSOFFS(64, 16), "PortSwLifetimeLimitDiscards", mad_dump_uint},
++ {BITSOFFS(80, 16), "PortSwHOQLifetimeLimitDiscards", mad_dump_uint},
+ {0, 0}, /* IB_PC_XMT_DISC_LAST_F */
+
+ /*
+ * PortRcvErrorDetails fields
+ */
+- {32, 16, "PortLocalPhysicalErrors", mad_dump_uint},
+- {48, 16, "PortMalformedPktErrors", mad_dump_uint},
+- {64, 16, "PortBufferOverrunErrors", mad_dump_uint},
+- {80, 16, "PortDLIDMappingErrors", mad_dump_uint},
+- {96, 16, "PortVLMappingErrors", mad_dump_uint},
+- {112, 16, "PortLoopingErrors", mad_dump_uint},
++ {BITSOFFS(32, 16), "PortLocalPhysicalErrors", mad_dump_uint},
++ {BITSOFFS(48, 16), "PortMalformedPktErrors", mad_dump_uint},
++ {BITSOFFS(64, 16), "PortBufferOverrunErrors", mad_dump_uint},
++ {BITSOFFS(80, 16), "PortDLIDMappingErrors", mad_dump_uint},
++ {BITSOFFS(96, 16), "PortVLMappingErrors", mad_dump_uint},
++ {BITSOFFS(112, 16), "PortLoopingErrors", mad_dump_uint},
+ {0, 0}, /* IB_PC_RCV_ERR_LAST_F */
+
+ /*
+@@ -485,25 +485,470 @@
+ {160, 64, "VendorMask", mad_dump_hex},
+ {224, 32, "SampleStart", mad_dump_uint},
+ {256, 32, "SampleInterval", mad_dump_uint},
+- {288, 16, "Tag", mad_dump_hex},
+- {304, 16, "CounterSelect0", mad_dump_hex},
+- {320, 16, "CounterSelect1", mad_dump_hex},
+- {336, 16, "CounterSelect2", mad_dump_hex},
+- {352, 16, "CounterSelect3", mad_dump_hex},
+- {368, 16, "CounterSelect4", mad_dump_hex},
+- {384, 16, "CounterSelect5", mad_dump_hex},
+- {400, 16, "CounterSelect6", mad_dump_hex},
+- {416, 16, "CounterSelect7", mad_dump_hex},
+- {432, 16, "CounterSelect8", mad_dump_hex},
+- {448, 16, "CounterSelect9", mad_dump_hex},
+- {464, 16, "CounterSelect10", mad_dump_hex},
+- {480, 16, "CounterSelect11", mad_dump_hex},
+- {496, 16, "CounterSelect12", mad_dump_hex},
+- {512, 16, "CounterSelect13", mad_dump_hex},
+- {528, 16, "CounterSelect14", mad_dump_hex},
++ {BITSOFFS(288, 16), "Tag", mad_dump_hex},
++ {BITSOFFS(304, 16), "CounterSelect0", mad_dump_hex},
++ {BITSOFFS(320, 16), "CounterSelect1", mad_dump_hex},
++ {BITSOFFS(336, 16), "CounterSelect2", mad_dump_hex},
++ {BITSOFFS(352, 16), "CounterSelect3", mad_dump_hex},
++ {BITSOFFS(368, 16), "CounterSelect4", mad_dump_hex},
++ {BITSOFFS(384, 16), "CounterSelect5", mad_dump_hex},
++ {BITSOFFS(400, 16), "CounterSelect6", mad_dump_hex},
++ {BITSOFFS(416, 16), "CounterSelect7", mad_dump_hex},
++ {BITSOFFS(432, 16), "CounterSelect8", mad_dump_hex},
++ {BITSOFFS(448, 16), "CounterSelect9", mad_dump_hex},
++ {BITSOFFS(464, 16), "CounterSelect10", mad_dump_hex},
++ {BITSOFFS(480, 16), "CounterSelect11", mad_dump_hex},
++ {BITSOFFS(496, 16), "CounterSelect12", mad_dump_hex},
++ {BITSOFFS(512, 16), "CounterSelect13", mad_dump_hex},
++ {BITSOFFS(528, 16), "CounterSelect14", mad_dump_hex},
+ {576, 64, "SamplesOnlyOptionMask", mad_dump_hex},
+ {0, 0}, /* IB_PSC_LAST_F */
+
++ /* GUIDInfo fields */
++ {0, 64, "GUID0", mad_dump_hex},
++ {64, 64, "GUID1", mad_dump_hex},
++ {128, 64, "GUID2", mad_dump_hex},
++ {192, 64, "GUID3", mad_dump_hex},
++ {256, 64, "GUID4", mad_dump_hex},
++ {320, 64, "GUID5", mad_dump_hex},
++ {384, 64, "GUID6", mad_dump_hex},
++ {448, 64, "GUID7", mad_dump_hex},
++
++ /* GUID Info Record */
++ {BITSOFFS(0, 16), "Lid", mad_dump_uint},
++ {BITSOFFS(16, 8), "BlockNum", mad_dump_uint},
++ {64, 64, "Guid0", mad_dump_hex},
++ {128, 64, "Guid1", mad_dump_hex},
++ {192, 64, "Guid2", mad_dump_hex},
++ {256, 64, "Guid3", mad_dump_hex},
++ {320, 64, "Guid4", mad_dump_hex},
++ {384, 64, "Guid5", mad_dump_hex},
++ {448, 64, "Guid6", mad_dump_hex},
++ {512, 64, "Guid7", mad_dump_hex},
++
++ /*
++ * More PortInfo fields
++ */
++ {BITSOFFS(480, 16), "CapabilityMask2", mad_dump_hex},
++ {BITSOFFS(496, 4), "LinkSpeedExtActive", mad_dump_linkspeedext},
++ {BITSOFFS(500, 4), "LinkSpeedExtSupported", mad_dump_linkspeedextsup},
++ {BITSOFFS(507, 5), "LinkSpeedExtEnabled", mad_dump_linkspeedexten},
++ {0, 0}, /* IB_PORT_LINK_SPEED_EXT_LAST_F */
++
++ /*
++ * PortExtendedSpeedsCounters fields
++ */
++ {BITSOFFS(8, 8), "PortSelect", mad_dump_uint},
++ {64, 64, "CounterSelect", mad_dump_hex},
++ {BITSOFFS(128, 16), "SyncHeaderErrorCounter", mad_dump_uint},
++ {BITSOFFS(144, 16), "UnknownBlockCounter", mad_dump_uint},
++ {BITSOFFS(160, 16), "ErrorDetectionCounterLane0", mad_dump_uint},
++ {BITSOFFS(176, 16), "ErrorDetectionCounterLane1", mad_dump_uint},
++ {BITSOFFS(192, 16), "ErrorDetectionCounterLane2", mad_dump_uint},
++ {BITSOFFS(208, 16), "ErrorDetectionCounterLane3", mad_dump_uint},
++ {BITSOFFS(224, 16), "ErrorDetectionCounterLane4", mad_dump_uint},
++ {BITSOFFS(240, 16), "ErrorDetectionCounterLane5", mad_dump_uint},
++ {BITSOFFS(256, 16), "ErrorDetectionCounterLane6", mad_dump_uint},
++ {BITSOFFS(272, 16), "ErrorDetectionCounterLane7", mad_dump_uint},
++ {BITSOFFS(288, 16), "ErrorDetectionCounterLane8", mad_dump_uint},
++ {BITSOFFS(304, 16), "ErrorDetectionCounterLane9", mad_dump_uint},
++ {BITSOFFS(320, 16), "ErrorDetectionCounterLane10", mad_dump_uint},
++ {BITSOFFS(336, 16), "ErrorDetectionCounterLane11", mad_dump_uint},
++ {352, 32, "FECCorrectableBlockCtrLane0", mad_dump_uint},
++ {384, 32, "FECCorrectableBlockCtrLane1", mad_dump_uint},
++ {416, 32, "FECCorrectableBlockCtrLane2", mad_dump_uint},
++ {448, 32, "FECCorrectableBlockCtrLane3", mad_dump_uint},
++ {480, 32, "FECCorrectableBlockCtrLane4", mad_dump_uint},
++ {512, 32, "FECCorrectableBlockCtrLane5", mad_dump_uint},
++ {544, 32, "FECCorrectableBlockCtrLane6", mad_dump_uint},
++ {576, 32, "FECCorrectableBlockCtrLane7", mad_dump_uint},
++ {608, 32, "FECCorrectableBlockCtrLane8", mad_dump_uint},
++ {640, 32, "FECCorrectableBlockCtrLane9", mad_dump_uint},
++ {672, 32, "FECCorrectableBlockCtrLane10", mad_dump_uint},
++ {704, 32, "FECCorrectableBlockCtrLane11", mad_dump_uint},
++ {736, 32, "FECUncorrectableBlockCtrLane0", mad_dump_uint},
++ {768, 32, "FECUncorrectableBlockCtrLane1", mad_dump_uint},
++ {800, 32, "FECUncorrectableBlockCtrLane2", mad_dump_uint},
++ {832, 32, "FECUncorrectableBlockCtrLane3", mad_dump_uint},
++ {864, 32, "FECUncorrectableBlockCtrLane4", mad_dump_uint},
++ {896, 32, "FECUncorrectableBlockCtrLane5", mad_dump_uint},
++ {928, 32, "FECUncorrectableBlockCtrLane6", mad_dump_uint},
++ {960, 32, "FECUncorrectableBlockCtrLane7", mad_dump_uint},
++ {992, 32, "FECUncorrectableBlockCtrLane8", mad_dump_uint},
++ {1024, 32, "FECUncorrectableBlockCtrLane9", mad_dump_uint},
++ {1056, 32, "FECUncorrectableBlockCtrLane10", mad_dump_uint},
++ {1088, 32, "FECUncorrectableBlockCtrLane11", mad_dump_uint},
++ {0, 0}, /* IB_PESC_LAST_F */
++
++ /*
++ * PortOpRcvCounters fields
++ */
++ {32, 32, "PortOpRcvPkts", mad_dump_uint},
++ {64, 32, "PortOpRcvData", mad_dump_uint},
++ {0, 0}, /* IB_PC_PORT_OP_RCV_COUNTERS_LAST_F */
++
++ /*
++ * PortFlowCtlCounters fields
++ */
++ {32, 32, "PortXmitFlowPkts", mad_dump_uint},
++ {64, 32, "PortRcvFlowPkts", mad_dump_uint},
++ {0, 0}, /* IB_PC_PORT_FLOW_CTL_COUNTERS_LAST_F */
++
++ /*
++ * PortVLOpPackets fields
++ */
++ {BITSOFFS(32, 16), "PortVLOpPackets0", mad_dump_uint},
++ {BITSOFFS(48, 16), "PortVLOpPackets1", mad_dump_uint},
++ {BITSOFFS(64, 16), "PortVLOpPackets2", mad_dump_uint},
++ {BITSOFFS(80, 16), "PortVLOpPackets3", mad_dump_uint},
++ {BITSOFFS(96, 16), "PortVLOpPackets4", mad_dump_uint},
++ {BITSOFFS(112, 16), "PortVLOpPackets5", mad_dump_uint},
++ {BITSOFFS(128, 16), "PortVLOpPackets6", mad_dump_uint},
++ {BITSOFFS(144, 16), "PortVLOpPackets7", mad_dump_uint},
++ {BITSOFFS(160, 16), "PortVLOpPackets8", mad_dump_uint},
++ {BITSOFFS(176, 16), "PortVLOpPackets9", mad_dump_uint},
++ {BITSOFFS(192, 16), "PortVLOpPackets10", mad_dump_uint},
++ {BITSOFFS(208, 16), "PortVLOpPackets11", mad_dump_uint},
++ {BITSOFFS(224, 16), "PortVLOpPackets12", mad_dump_uint},
++ {BITSOFFS(240, 16), "PortVLOpPackets13", mad_dump_uint},
++ {BITSOFFS(256, 16), "PortVLOpPackets14", mad_dump_uint},
++ {BITSOFFS(272, 16), "PortVLOpPackets15", mad_dump_uint},
++ {0, 0}, /* IB_PC_PORT_VL_OP_PACKETS_LAST_F */
++
++ /*
++ * PortVLOpData fields
++ */
++ {32, 32, "PortVLOpData0", mad_dump_uint},
++ {64, 32, "PortVLOpData1", mad_dump_uint},
++ {96, 32, "PortVLOpData2", mad_dump_uint},
++ {128, 32, "PortVLOpData3", mad_dump_uint},
++ {160, 32, "PortVLOpData4", mad_dump_uint},
++ {192, 32, "PortVLOpData5", mad_dump_uint},
++ {224, 32, "PortVLOpData6", mad_dump_uint},
++ {256, 32, "PortVLOpData7", mad_dump_uint},
++ {288, 32, "PortVLOpData8", mad_dump_uint},
++ {320, 32, "PortVLOpData9", mad_dump_uint},
++ {352, 32, "PortVLOpData10", mad_dump_uint},
++ {384, 32, "PortVLOpData11", mad_dump_uint},
++ {416, 32, "PortVLOpData12", mad_dump_uint},
++ {448, 32, "PortVLOpData13", mad_dump_uint},
++ {480, 32, "PortVLOpData14", mad_dump_uint},
++ {512, 32, "PortVLOpData15", mad_dump_uint},
++ {0, 0}, /* IB_PC_PORT_VL_OP_DATA_LAST_F */
++
++ /*
++ * PortVLXmitFlowCtlUpdateErrors fields
++ */
++ {BITSOFFS(32, 2), "PortVLXmitFlowCtlUpdateErrors0", mad_dump_uint},
++ {BITSOFFS(34, 2), "PortVLXmitFlowCtlUpdateErrors1", mad_dump_uint},
++ {BITSOFFS(36, 2), "PortVLXmitFlowCtlUpdateErrors2", mad_dump_uint},
++ {BITSOFFS(38, 2), "PortVLXmitFlowCtlUpdateErrors3", mad_dump_uint},
++ {BITSOFFS(40, 2), "PortVLXmitFlowCtlUpdateErrors4", mad_dump_uint},
++ {BITSOFFS(42, 2), "PortVLXmitFlowCtlUpdateErrors5", mad_dump_uint},
++ {BITSOFFS(44, 2), "PortVLXmitFlowCtlUpdateErrors6", mad_dump_uint},
++ {BITSOFFS(46, 2), "PortVLXmitFlowCtlUpdateErrors7", mad_dump_uint},
++ {BITSOFFS(48, 2), "PortVLXmitFlowCtlUpdateErrors8", mad_dump_uint},
++ {BITSOFFS(50, 2), "PortVLXmitFlowCtlUpdateErrors9", mad_dump_uint},
++ {BITSOFFS(52, 2), "PortVLXmitFlowCtlUpdateErrors10", mad_dump_uint},
++ {BITSOFFS(54, 2), "PortVLXmitFlowCtlUpdateErrors11", mad_dump_uint},
++ {BITSOFFS(56, 2), "PortVLXmitFlowCtlUpdateErrors12", mad_dump_uint},
++ {BITSOFFS(58, 2), "PortVLXmitFlowCtlUpdateErrors13", mad_dump_uint},
++ {BITSOFFS(60, 2), "PortVLXmitFlowCtlUpdateErrors14", mad_dump_uint},
++ {BITSOFFS(62, 2), "PortVLXmitFlowCtlUpdateErrors15", mad_dump_uint},
++ {0, 0}, /* IB_PC_PORT_VL_XMIT_FLOW_CTL_UPDATE_ERRORS_LAST_F */
++
++ /*
++ * PortVLXmitWaitCounters fields
++ */
++ {BITSOFFS(32, 16), "PortVLXmitWait0", mad_dump_uint},
++ {BITSOFFS(48, 16), "PortVLXmitWait1", mad_dump_uint},
++ {BITSOFFS(64, 16), "PortVLXmitWait2", mad_dump_uint},
++ {BITSOFFS(80, 16), "PortVLXmitWait3", mad_dump_uint},
++ {BITSOFFS(96, 16), "PortVLXmitWait4", mad_dump_uint},
++ {BITSOFFS(112, 16), "PortVLXmitWait5", mad_dump_uint},
++ {BITSOFFS(128, 16), "PortVLXmitWait6", mad_dump_uint},
++ {BITSOFFS(144, 16), "PortVLXmitWait7", mad_dump_uint},
++ {BITSOFFS(160, 16), "PortVLXmitWait8", mad_dump_uint},
++ {BITSOFFS(176, 16), "PortVLXmitWait9", mad_dump_uint},
++ {BITSOFFS(192, 16), "PortVLXmitWait10", mad_dump_uint},
++ {BITSOFFS(208, 16), "PortVLXmitWait11", mad_dump_uint},
++ {BITSOFFS(224, 16), "PortVLXmitWait12", mad_dump_uint},
++ {BITSOFFS(240, 16), "PortVLXmitWait13", mad_dump_uint},
++ {BITSOFFS(256, 16), "PortVLXmitWait14", mad_dump_uint},
++ {BITSOFFS(272, 16), "PortVLXmitWait15", mad_dump_uint},
++ {0, 0}, /* IB_PC_PORT_VL_XMIT_WAIT_COUNTERS_LAST_F */
++
++ /*
++ * SwPortVLCongestion fields
++ */
++ {BITSOFFS(32, 16), "SWPortVLCongestion0", mad_dump_uint},
++ {BITSOFFS(48, 16), "SWPortVLCongestion1", mad_dump_uint},
++ {BITSOFFS(64, 16), "SWPortVLCongestion2", mad_dump_uint},
++ {BITSOFFS(80, 16), "SWPortVLCongestion3", mad_dump_uint},
++ {BITSOFFS(96, 16), "SWPortVLCongestion4", mad_dump_uint},
++ {BITSOFFS(112, 16), "SWPortVLCongestion5", mad_dump_uint},
++ {BITSOFFS(128, 16), "SWPortVLCongestion6", mad_dump_uint},
++ {BITSOFFS(144, 16), "SWPortVLCongestion7", mad_dump_uint},
++ {BITSOFFS(160, 16), "SWPortVLCongestion8", mad_dump_uint},
++ {BITSOFFS(176, 16), "SWPortVLCongestion9", mad_dump_uint},
++ {BITSOFFS(192, 16), "SWPortVLCongestion10", mad_dump_uint},
++ {BITSOFFS(208, 16), "SWPortVLCongestion11", mad_dump_uint},
++ {BITSOFFS(224, 16), "SWPortVLCongestion12", mad_dump_uint},
++ {BITSOFFS(240, 16), "SWPortVLCongestion13", mad_dump_uint},
++ {BITSOFFS(256, 16), "SWPortVLCongestion14", mad_dump_uint},
++ {BITSOFFS(272, 16), "SWPortVLCongestion15", mad_dump_uint},
++ {0, 0}, /* IB_PC_SW_PORT_VL_CONGESTION_LAST_F */
++
++ /*
++ * PortRcvConCtrl fields
++ */
++ {32, 32, "PortPktRcvFECN", mad_dump_uint},
++ {64, 32, "PortPktRcvBECN", mad_dump_uint},
++ {0, 0}, /* IB_PC_RCV_CON_CTRL_LAST_F */
++
++ /*
++ * PortSLRcvFECN fields
++ */
++ {32, 32, "PortSLRcvFECN0", mad_dump_uint},
++ {64, 32, "PortSLRcvFECN1", mad_dump_uint},
++ {96, 32, "PortSLRcvFECN2", mad_dump_uint},
++ {128, 32, "PortSLRcvFECN3", mad_dump_uint},
++ {160, 32, "PortSLRcvFECN4", mad_dump_uint},
++ {192, 32, "PortSLRcvFECN5", mad_dump_uint},
++ {224, 32, "PortSLRcvFECN6", mad_dump_uint},
++ {256, 32, "PortSLRcvFECN7", mad_dump_uint},
++ {288, 32, "PortSLRcvFECN8", mad_dump_uint},
++ {320, 32, "PortSLRcvFECN9", mad_dump_uint},
++ {352, 32, "PortSLRcvFECN10", mad_dump_uint},
++ {384, 32, "PortSLRcvFECN11", mad_dump_uint},
++ {416, 32, "PortSLRcvFECN12", mad_dump_uint},
++ {448, 32, "PortSLRcvFECN13", mad_dump_uint},
++ {480, 32, "PortSLRcvFECN14", mad_dump_uint},
++ {512, 32, "PortSLRcvFECN15", mad_dump_uint},
++ {0, 0}, /* IB_PC_SL_RCV_FECN_LAST_F */
++
++ /*
++ * PortSLRcvBECN fields
++ */
++ {32, 32, "PortSLRcvBECN0", mad_dump_uint},
++ {64, 32, "PortSLRcvBECN1", mad_dump_uint},
++ {96, 32, "PortSLRcvBECN2", mad_dump_uint},
++ {128, 32, "PortSLRcvBECN3", mad_dump_uint},
++ {160, 32, "PortSLRcvBECN4", mad_dump_uint},
++ {192, 32, "PortSLRcvBECN5", mad_dump_uint},
++ {224, 32, "PortSLRcvBECN6", mad_dump_uint},
++ {256, 32, "PortSLRcvBECN7", mad_dump_uint},
++ {288, 32, "PortSLRcvBECN8", mad_dump_uint},
++ {320, 32, "PortSLRcvBECN9", mad_dump_uint},
++ {352, 32, "PortSLRcvBECN10", mad_dump_uint},
++ {384, 32, "PortSLRcvBECN11", mad_dump_uint},
++ {416, 32, "PortSLRcvBECN12", mad_dump_uint},
++ {448, 32, "PortSLRcvBECN13", mad_dump_uint},
++ {480, 32, "PortSLRcvBECN14", mad_dump_uint},
++ {512, 32, "PortSLRcvBECN15", mad_dump_uint},
++ {0, 0}, /* IB_PC_SL_RCV_BECN_LAST_F */
++
++ /*
++ * PortXmitConCtrl fields
++ */
++ {32, 32, "PortXmitTimeCong", mad_dump_uint},
++ {0, 0}, /* IB_PC_XMIT_CON_CTRL_LAST_F */
++
++ /*
++ * PortVLXmitTimeCong fields
++ */
++ {32, 32, "PortVLXmitTimeCong0", mad_dump_uint},
++ {64, 32, "PortVLXmitTimeCong1", mad_dump_uint},
++ {96, 32, "PortVLXmitTimeCong2", mad_dump_uint},
++ {128, 32, "PortVLXmitTimeCong3", mad_dump_uint},
++ {160, 32, "PortVLXmitTimeCong4", mad_dump_uint},
++ {192, 32, "PortVLXmitTimeCong5", mad_dump_uint},
++ {224, 32, "PortVLXmitTimeCong6", mad_dump_uint},
++ {256, 32, "PortVLXmitTimeCong7", mad_dump_uint},
++ {288, 32, "PortVLXmitTimeCong8", mad_dump_uint},
++ {320, 32, "PortVLXmitTimeCong9", mad_dump_uint},
++ {352, 32, "PortVLXmitTimeCong10", mad_dump_uint},
++ {384, 32, "PortVLXmitTimeCong11", mad_dump_uint},
++ {416, 32, "PortVLXmitTimeCong12", mad_dump_uint},
++ {448, 32, "PortVLXmitTimeCong13", mad_dump_uint},
++ {480, 32, "PortVLXmitTimeCong14", mad_dump_uint},
++ {0, 0}, /* IB_PC_VL_XMIT_TIME_CONG_LAST_F */
++
++ /*
++ * Mellanox ExtendedPortInfo fields
++ */
++ {BITSOFFS(24, 8), "StateChangeEnable", mad_dump_hex},
++ {BITSOFFS(56, 8), "LinkSpeedSupported", mad_dump_hex},
++ {BITSOFFS(88, 8), "LinkSpeedEnabled", mad_dump_hex},
++ {BITSOFFS(120, 8), "LinkSpeedActive", mad_dump_hex},
++ {0, 0}, /* IB_MLNX_EXT_PORT_LAST_F */
++
++ /*
++ * Congestion Control Mad fields
++ * bytes 24-31 of congestion control mad
++ */
++ {192, 64, "CC_Key", mad_dump_hex}, /* IB_CC_CCKEY_F */
++
++ /*
++ * CongestionInfo fields
++ */
++ {BITSOFFS(0, 16), "CongestionInfo", mad_dump_hex},
++ {BITSOFFS(16, 8), "ControlTableCap", mad_dump_uint},
++ {0, 0}, /* IB_CC_CONGESTION_INFO_LAST_F */
++
++ /*
++ * CongestionKeyInfo fields
++ */
++ {0, 64, "CC_Key", mad_dump_hex},
++ {BITSOFFS(64, 1), "CC_KeyProtectBit", mad_dump_uint},
++ {BITSOFFS(80, 16), "CC_KeyLeasePeriod", mad_dump_uint},
++ {BITSOFFS(96, 16), "CC_KeyViolations", mad_dump_uint},
++ {0, 0}, /* IB_CC_CONGESTION_KEY_INFO_LAST_F */
++
++ /*
++ * CongestionLog (common) fields
++ */
++ {BITSOFFS(0, 8), "LogType", mad_dump_uint},
++ {BITSOFFS(8, 8), "CongestionFlags", mad_dump_hex},
++ {0, 0}, /* IB_CC_CONGESTION_LOG_LAST_F */
++
++ /*
++ * CongestionLog (Switch) fields
++ */
++ {BITSOFFS(16, 16), "LogEventsCounter", mad_dump_uint},
++ {32, 32, "CurrentTimeStamp", mad_dump_uint},
++ {64, 256, "PortMap", mad_dump_array},
++ {0, 0}, /* IB_CC_CONGESTION_LOG_SWITCH_LAST_F */
++
++ /*
++ * CongestionLogEvent (Switch) fields
++ */
++ {BITSOFFS(0, 16), "SLID", mad_dump_uint},
++ {BITSOFFS(16, 16), "DLID", mad_dump_uint},
++ {BITSOFFS(32, 4), "SL", mad_dump_uint},
++ {64, 32, "Timestamp", mad_dump_uint},
++ {0, 0}, /* IB_CC_CONGESTION_LOG_ENTRY_SWITCH_LAST_F */
++
++ /*
++ * CongestionLog (CA) fields
++ */
++ {BITSOFFS(16, 16), "ThresholdEventCounter", mad_dump_uint},
++ {BITSOFFS(32, 16), "ThresholdCongestionEventMap", mad_dump_hex},
++ /* XXX: Q3/2010 errata lists offset 48, but that means field is not
++ * world aligned. Assume will be aligned to offset 64 later.
++ */
++ {BITSOFFS(64, 32), "CurrentTimeStamp", mad_dump_uint},
++ {0, 0}, /* IB_CC_CONGESTION_LOG_CA_LAST_F */
++
++ /*
++ * CongestionLogEvent (CA) fields
++ */
++ {BITSOFFS(0, 24), "Local_QP_CN_Entry", mad_dump_uint},
++ {BITSOFFS(24, 4), "SL_CN_Entry", mad_dump_uint},
++ {BITSOFFS(28, 4), "Service_Type_CN_Entry", mad_dump_hex},
++ {BITSOFFS(32, 24), "Remote_QP_Number_CN_Entry", mad_dump_uint},
++ {BITSOFFS(64, 16), "Local_LID_CN", mad_dump_uint},
++ {BITSOFFS(80, 16), "Remote_LID_CN_Entry", mad_dump_uint},
++ {BITSOFFS(96, 32), "Timestamp_CN_Entry", mad_dump_uint},
++ {0, 0}, /* IB_CC_CONGESTION_LOG_ENTRY_CA_LAST_F */
++
++ /*
++ * SwitchCongestionSetting fields
++ */
++ {0, 32, "Control_Map", mad_dump_hex},
++ {32, 256, "Victim_Mask", mad_dump_array},
++ {288, 256, "Credit_Mask", mad_dump_array},
++ {BITSOFFS(544, 4), "Threshold", mad_dump_uint},
++ {BITSOFFS(552, 8), "Packet_Size", mad_dump_uint},
++ {BITSOFFS(560, 4), "CS_Threshold", mad_dump_uint},
++ {BITSOFFS(576, 16), "CS_ReturnDelay", mad_dump_hex}, /* TODO: CCT dump */
++ {BITSOFFS(592, 16), "Marking_Rate", mad_dump_uint},
++ {0, 0}, /* IB_CC_SWITCH_CONGESTION_SETTING_LAST_F */
++
++ /*
++ * SwitchPortCongestionSettingElement fields
++ */
++ {BITSOFFS(0, 1), "Valid", mad_dump_uint},
++ {BITSOFFS(1, 1), "Control_Type", mad_dump_uint},
++ {BITSOFFS(4, 4), "Threshold", mad_dump_hex},
++ {BITSOFFS(8, 8), "Packet_Size", mad_dump_uint},
++ {BITSOFFS(16, 16), "Cong_Parm_Marking_Rate", mad_dump_uint},
++ {0, 0}, /* IB_CC_SWITCH_PORT_CONGESTION_SETTING_ELEMENT_LAST_F */
++
++ /*
++ * CACongestionSetting fields
++ */
++ {BITSOFFS(0, 16), "Port_Control", mad_dump_hex},
++ {BITSOFFS(16, 16), "Control_Map", mad_dump_hex},
++ {0, 0}, /* IB_CC_CA_CONGESTION_SETTING_LAST_F */
++
++ /*
++ * CACongestionEntry fields
++ */
++ {BITSOFFS(0, 16), "CCTI_Timer", mad_dump_uint},
++ {BITSOFFS(16, 8), "CCTI_Increase", mad_dump_uint},
++ {BITSOFFS(24, 8), "Trigger_Threshold", mad_dump_uint},
++ {BITSOFFS(32, 8), "CCTI_Min", mad_dump_uint},
++ {0, 0}, /* IB_CC_CA_CONGESTION_SETTING_ENTRY_LAST_F */
++
++ /*
++ * CongestionControlTable fields
++ */
++ {BITSOFFS(0, 16), "CCTI_Limit", mad_dump_uint},
++ {0, 0}, /* IB_CC_CONGESTION_CONTROL_TABLE_LAST_F */
++
++ /*
++ * CongestionControlTableEntry fields
++ */
++ {BITSOFFS(0, 2), "CCT_Shift", mad_dump_uint},
++ {BITSOFFS(2, 14), "CCT_Multiplier", mad_dump_uint},
++ {0, 0}, /* IB_CC_CONGESTION_CONTROL_TABLE_ENTRY_LAST_F */
++
++ /*
++ * Timestamp fields
++ */
++ {0, 32, "Timestamp", mad_dump_uint},
++ {0, 0}, /* IB_CC_TIMESTAMP_LAST_F */
++
++ /* Node Record */
++ {BITSOFFS(0, 16), "Lid", mad_dump_uint},
++ {BITSOFFS(32, 8), "BaseVers", mad_dump_uint},
++ {BITSOFFS(40, 8), "ClassVers", mad_dump_uint},
++ {BITSOFFS(48, 8), "NodeType", mad_dump_node_type},
++ {BITSOFFS(56, 8), "NumPorts", mad_dump_uint},
++ {64, 64, "SystemGuid", mad_dump_hex},
++ {128, 64, "Guid", mad_dump_hex},
++ {192, 64, "PortGuid", mad_dump_hex},
++ {BITSOFFS(256, 16), "PartCap", mad_dump_uint},
++ {BITSOFFS(272, 16), "DevId", mad_dump_hex},
++ {288, 32, "Revision", mad_dump_hex},
++ {BITSOFFS(320, 8), "LocalPort", mad_dump_uint},
++ {BITSOFFS(328, 24), "VendorId", mad_dump_hex},
++ {352, 64 * 8, "NodeDesc", mad_dump_string},
++ {0, 0}, /* IB_SA_NR_LAST_F */
++
++ /*
++ * PortSamplesResult fields
++ */
++ {BITSOFFS(0, 16), "Tag", mad_dump_hex},
++ {BITSOFFS(30, 2), "SampleStatus", mad_dump_hex},
++ {32, 32, "Counter0", mad_dump_uint},
++ {64, 32, "Counter1", mad_dump_uint},
++ {96, 32, "Counter2", mad_dump_uint},
++ {128, 32, "Counter3", mad_dump_uint},
++ {160, 32, "Counter4", mad_dump_uint},
++ {192, 32, "Counter5", mad_dump_uint},
++ {224, 32, "Counter6", mad_dump_uint},
++ {256, 32, "Counter7", mad_dump_uint},
++ {288, 32, "Counter8", mad_dump_uint},
++ {320, 32, "Counter9", mad_dump_uint},
++ {352, 32, "Counter10", mad_dump_uint},
++ {384, 32, "Counter11", mad_dump_uint},
++ {416, 32, "Counter12", mad_dump_uint},
++ {448, 32, "Counter13", mad_dump_uint},
++ {480, 32, "Counter14", mad_dump_uint},
++ {0, 0}, /* IB_PSR_LAST_F */
++
+ {0, 0} /* IB_FIELD_LAST_ */
+
+ };
+@@ -514,7 +959,7 @@
uint64_t nval;
nval = htonll(val);
@@ -630,7 +1180,7 @@
sizeof(uint64_t));
}
-@@ -521,7 +521,7 @@
+@@ -521,7 +966,7 @@
static uint64_t _get_field64(void *buf, int base_offs, const ib_field_t * f)
{
uint64_t val;
@@ -714,7 +1264,7 @@
mad_set_field64(selfgid, 0, IB_GID_GUID_F, selfguid);
diff -r -u /tmp/libibmad-1.3.7/src/dump.c libibmad-1.3.7/src/dump.c
--- /tmp/libibmad-1.3.7/src/dump.c Wed Feb 16 02:12:53 2011
-+++ libibmad-1.3.7/src/dump.c Thu Feb 24 11:27:11 2011
++++ libibmad-1.3.7/src/dump.c Mon May 27 17:23:19 2013
@@ -46,12 +46,24 @@
void mad_dump_int(char *buf, int bufsz, void *val, int valsz)
@@ -828,6 +1378,187 @@
break;
case 3:
snprintf(buf, bufsz, "%06x", *(uint32_t *) val & 0xffffff);
+@@ -308,6 +357,21 @@
+ dump_linkspeed(buf, bufsz, speed);
+ }
+
++void mad_dump_linkspeedext(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_linkspeedextsup(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_linkspeedexten(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
+ void mad_dump_portstate(char *buf, int bufsz, void *val, int valsz)
+ {
+ int state = *(int *)val;
+@@ -760,6 +824,158 @@
+ _dump_fields(buf, bufsz, val, IB_PSC_OPCODE_F, IB_PSC_LAST_F);
+ }
+
++void mad_dump_portsamples_result(char *buf, int bufsz, void *val, int valsz)
++{
++
++ return;
++}
++
++void mad_dump_port_ext_speeds_counters(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_perfcounters_port_op_rcv_counters(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_perfcounters_port_flow_ctl_counters(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_perfcounters_port_vl_op_packet(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_perfcounters_port_vl_op_data(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_perfcounters_port_vl_xmit_flow_ctl_update_errors(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_perfcounters_port_vl_xmit_wait_counters(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_perfcounters_sw_port_vl_congestion(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++
++void mad_dump_perfcounters_rcv_con_ctrl(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_perfcounters_sl_rcv_fecn(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_perfcounters_sl_rcv_becn(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_perfcounters_xmit_con_ctrl(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_perfcounters_vl_xmit_time_cong(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_mlnx_ext_port_info(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_congestioninfo(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_congestionkeyinfo(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_congestionlog(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_congestionlogswitch(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_congestionlogentryswitch(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_congestionlogca(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_congestionlogentryca(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_switchcongestionsetting(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_switchportcongestionsettingelement(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_cacongestionsetting(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_cacongestionentry(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_congestioncontroltable(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_congestioncontroltableentry(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_cc_timestamp(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
++void mad_dump_classportinfo(char *buf, int bufsz, void *val, int valsz)
++{
++ return;
++}
++
+ void xdump(FILE * file, char *msg, void *p, int size)
+ {
+ #define HEX(x) ((x) < 10 ? '0' + (x) : 'a' + ((x) -10))
diff -r -u /tmp/libibmad-1.3.7/src/sa.c libibmad-1.3.7/src/sa.c
--- /tmp/libibmad-1.3.7/src/sa.c Wed Feb 16 02:12:53 2011
+++ libibmad-1.3.7/src/sa.c Mon Oct 1 01:32:21 2012
@@ -898,7 +1629,7 @@
}
diff -r -u /tmp/libibmad-1.3.7/src/libibmad.map libibmad-1.3.7/src/libibmad.map
--- /tmp/libibmad-1.3.7/src/libibmad.map Wed Feb 16 02:12:53 2011
-+++ libibmad-1.3.7/src/libibmad.map Thu Mar 7 10:27:47 2013
++++ libibmad-1.3.7/src/libibmad.map Thu Apr 4 12:02:51 2013
@@ -102,6 +102,7 @@
ib_vendor_call_via;
smp_query_via;
@@ -947,7 +1678,7 @@
IBPANIC("too many classes %d requested", num_classes);
diff -r -u /tmp/libibmad-1.3.7/src/serv.c libibmad-1.3.7/src/serv.c
--- /tmp/libibmad-1.3.7/src/serv.c Wed Feb 16 02:12:53 2011
-+++ libibmad-1.3.7/src/serv.c Thu Feb 24 11:27:14 2011
++++ libibmad-1.3.7/src/serv.c Tue Mar 5 13:18:51 2013
@@ -38,6 +38,7 @@
#include <stdio.h>
#include <stdlib.h>
diff --git a/components/openssl/openssl-1.0.1/Makefile b/components/openssl/openssl-1.0.1/Makefile
index ab15654..8c957d5 100644
--- a/components/openssl/openssl-1.0.1/Makefile
+++ b/components/openssl/openssl-1.0.1/Makefile
@@ -273,6 +273,7 @@
crypto/evp/pmeth_fn.o crypto/evp/pmeth_gn.o crypto/evp/pmeth_lib.o \
crypto/ex_data.o crypto/hmac/hm_ameth.o crypto/hmac/hm_pmeth.o \
crypto/hmac/hmac.o crypto/lhash/lhash.o crypto/md4/md4_dgst.o \
+ crypto/md5/md5-sparcv9.o \
crypto/md5/md5_dgst.o crypto/mem.o crypto/mem_dbg.o crypto/modes/cbc128.o \
crypto/modes/ccm128.o crypto/modes/cfb128.o crypto/modes/ctr128.o \
crypto/modes/gcm128.o crypto/modes/ghash-sparcv9.o crypto/modes/ofb128.o \
@@ -324,7 +325,7 @@
ssl/s3_both.o ssl/s3_clnt.o ssl/s3_enc.o ssl/s3_lib.o ssl/s3_pkt.o \
ssl/ssl_algs.o ssl/ssl_asn1.o ssl/ssl_cert.o ssl/ssl_ciph.o ssl/ssl_err.o \
ssl/ssl_err2.o ssl/ssl_lib.o ssl/ssl_rsa.o ssl/ssl_sess.o ssl/t1_enc.o \
- ssl/t1_lib.o ssl/t1_reneg.o ssl/d1_srtp.o
+ ssl/t1_lib.o ssl/t1_reneg.o ssl/d1_srtp.o ssl/s3_cbc.o ssl/t1_clnt.o
# Linking of openssl bits for wanboot.
# Interface for wanboot is specified in mapfile.wanboot. Object files are
diff --git a/components/openssl/openssl-1.0.1/mapfile.wanboot b/components/openssl/openssl-1.0.1/mapfile.wanboot
index 0ae813e..c519530 100644
--- a/components/openssl/openssl-1.0.1/mapfile.wanboot
+++ b/components/openssl/openssl-1.0.1/mapfile.wanboot
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -77,6 +77,7 @@
SSL_read;
SSL_new;
SSLv3_client_method;
+ TLSv1_2_client_method;
X509_check_private_key;
SSL_CTX_new;
ASN1_TYPE_set;
diff --git a/components/openssl/openssl-1.0.1/patches/openssl-t4-inline.sparc-patch b/components/openssl/openssl-1.0.1/patches/openssl-t4-inline.sparc-patch
index 6a305df..a29c9d3 100644
--- a/components/openssl/openssl-1.0.1/patches/openssl-t4-inline.sparc-patch
+++ b/components/openssl/openssl-1.0.1/patches/openssl-t4-inline.sparc-patch
@@ -78,7 +78,7 @@
diff -ru openssl-1.0.1e/crypto/sparcv9cap.c openssl-1.0.1e/crypto/sparcv9cap.c
--- openssl-1.0.1e/crypto/sparcv9cap.c 2011-05-24 17:02:24.000000000 -0700
+++ openssl-1.0.1e/crypto/sparcv9cap.c 2011-07-27 10:48:17.817470000 -0700
-@@ -6,17 +6,12 @@
+@@ -6,16 +6,15 @@
#include <sys/time.h>
#include <openssl/bn.h>
@@ -89,18 +89,19 @@
-#define SPARCV9_FMADD (1<<4) /* reserved for SPARC64 V */
+#include "sparc_arch.h"
--#ifndef _BOOT
--static int OPENSSL_sparcv9cap_P=SPARCV9_TICK_PRIVILEGED;
--#else
--static int OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
+#if defined(__GNUC__) && defined(__linux)
+__attribute__((visibility("hidden")))
- #endif
++#endif
+ #ifndef _BOOT
+-static int OPENSSL_sparcv9cap_P=SPARCV9_TICK_PRIVILEGED;
+unsigned int OPENSSL_sparcv9cap_P[2]={SPARCV9_TICK_PRIVILEGED,0};
+ #else
+-static int OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
++unsigned int OPENSSL_sparcv9cap_P[2]={SPARCV9_VIS1,0};
+ #endif
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0, int num)
- {
-@@ -24,7 +19,7 @@
+@@ -24,7 +23,7 @@
int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0, int num);
if (num>=8 && !(num&1) &&
@@ -109,7 +110,7 @@
(SPARCV9_PREFER_FPU|SPARCV9_VIS1))
return bn_mul_mont_fpu(rp,ap,bp,np,n0,num);
else
-@@ -36,11 +31,15 @@
+@@ -36,11 +35,16 @@
unsigned long _sparcv9_vis1_instrument(void);
void _sparcv9_vis2_probe(void);
void _sparcv9_fmadd_probe(void);
@@ -117,9 +118,9 @@
+void _sparcv9_vis3_probe(void);
+unsigned long _sparcv9_random(void);
+size_t _sparcv9_vis1_instrument_bus(unsigned int *,size_t);
-+size_t _sparcv8_vis1_instrument_bus2(unsigned int *,size_t,size_t);
++size_t _sparcv9_vis1_instrument_bus2(unsigned int *,size_t,size_t);
--#ifndef _BOOT
+ #ifndef _BOOT
unsigned long OPENSSL_rdtsc(void)
{
- if (OPENSSL_sparcv9cap_P&SPARCV9_TICK_PRIVILEGED)
@@ -127,29 +128,19 @@
#if defined(__sun) && defined(__SVR4)
return gethrtime();
#else
-@@ -49,19 +48,26 @@
- else
- return _sparcv9_rdtick();
+@@ -51,6 +55,25 @@
}
--#endif
+ #endif
--#if defined(_BOOT)
--/*
-- * Hardcoding sparc capabilities for wanboot.
-- * Older CPUs are EOLed anyway.
-- */
--void OPENSSL_cpuid_setup(void)
+size_t OPENSSL_instrument_bus(unsigned int *out,size_t cnt)
- {
-- OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
++ {
+ if (OPENSSL_sparcv9cap_P[0]&(SPARCV9_TICK_PRIVILEGED|SPARCV9_BLK) ==
+ SPARCV9_BLK)
+ return _sparcv9_vis1_instrument_bus(out,cnt);
+ else
+ return 0;
- }
-
--#elif 0 && defined(__sun) && defined(__SVR4)
++ }
++
+size_t OPENSSL_instrument_bus2(unsigned int *out,size_t cnt,size_t max)
+ {
+ if (OPENSSL_sparcv9cap_P[0]&(SPARCV9_TICK_PRIVILEGED|SPARCV9_BLK) ==
@@ -159,11 +150,20 @@
+ return 0;
+ }
+
-+#if 0 && defined(__sun) && defined(__SVR4)
- /* This code path is disabled, because of incompatibility of
- * libdevinfo.so.1 and libmalloc.so.1 (see below for details)
++
+ #if defined(_BOOT)
+ /*
+ * Hardcoding sparc capabilities for wanboot.
+@@ -58,7 +81,7 @@
*/
-@@ -85,11 +91,11 @@
+ void OPENSSL_cpuid_setup(void)
+ {
+- OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
++ OPENSSL_sparcv9cap_P[0] = SPARCV9_VIS1;
+ }
+
+ #elif 0 && defined(__sun) && defined(__SVR4)
+@@ -85,11 +108,11 @@
if (!strcmp (name,"SUNW,UltraSPARC") ||
!strncmp(name,"SUNW,UltraSPARC-I",17)) /* covers II,III,IV */
{
@@ -177,7 +177,7 @@
return DI_WALK_TERMINATE;
}
-@@ -96,7 +102,7 @@
+@@ -96,7 +119,7 @@
/* This is expected to catch remaining UltraSPARCs, such as T1 */
else if (!strncmp(name,"SUNW,UltraSPARC",15))
{
@@ -186,7 +186,7 @@
return DI_WALK_TERMINATE;
}
-@@ -115,7 +121,7 @@
+@@ -115,7 +138,7 @@
if ((e=getenv("OPENSSL_sparcv9cap")))
{
@@ -195,7 +195,7 @@
return;
}
-@@ -123,17 +129,17 @@
+@@ -123,17 +146,17 @@
{
if (strcmp(si,"sun4v"))
/* FPU is preferred for all CPUs, but US-T1/2 */
@@ -217,7 +217,7 @@
return;
}
}
-@@ -193,12 +199,14 @@
+@@ -193,12 +216,14 @@
if ((e=getenv("OPENSSL_sparcv9cap")))
{
@@ -234,7 +234,7 @@
sigfillset(&all_masked);
sigdelset(&all_masked,SIGILL);
-@@ -221,20 +229,20 @@
+@@ -221,20 +246,20 @@
if (sigsetjmp(common_jmp,1) == 0)
{
_sparcv9_rdtick();
@@ -259,7 +259,7 @@
}
}
-@@ -241,9 +249,37 @@
+@@ -241,9 +266,37 @@
if (sigsetjmp(common_jmp,1) == 0)
{
_sparcv9_fmadd_probe();
diff --git a/components/pixz/Makefile b/components/pixz/Makefile
new file mode 100644
index 0000000..6750918
--- /dev/null
+++ b/components/pixz/Makefile
@@ -0,0 +1,65 @@
+#
+# 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 (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME= pixz
+COMPONENT_VERSION= 1.0
+COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_PROJECT_URL= http://github.com/vasi/pixz/
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+ sha256:912c60de88f7eca2e1c6fe13eec5371f723018dca933796c47cd50bf6a349fc9
+COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)archive/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB= utility/pixz
+
+include ../../make-rules/prep.mk
+include ../../make-rules/justmake.mk
+include ../../make-rules/ips.mk
+
+PKG_PROTO_DIRS += $(BUILD_DIR_64)
+PKG_PROTO_DIRS += $(COMPONENT_DIR)/files
+
+# Userland default includes -mt which links with libthread which we don't need.
+studio_MT =
+
+# pixz's Makefile hard-codes some gcc-only flags in MYCFLAGS and MYLDFLAGS,
+# then appends CFLAGS & LDFLAGS to each. Here we include their preset values
+# minus the gcc-only parts, so we can build with Studio.
+COMPONENT_BUILD_ARGS += CC="$(CC)"
+COMPONENT_BUILD_ARGS += MYCFLAGS='$(patsubst %,-I%/include,$(LIBPREFIX)) $(OPT)'
+COMPONENT_BUILD_ARGS += MYLDFLAGS='$(patsubst %,-L%/lib,$(LIBPREFIX)) $(OPT)'
+COMPONENT_BUILD_ARGS += CFLAGS="$(CFLAGS)"
+COMPONENT_BUILD_ARGS += LDFLAGS="$(CC_BITS)"
+
+ASLR_MODE = $(ASLR_ENABLE)
+
+# common targets
+build: $(BUILD_64)
+
+install: $(BUILD_64)
+
+test: $(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk
diff --git a/components/pixz/files/pixz.1 b/components/pixz/files/pixz.1
new file mode 100644
index 0000000..4115711
--- /dev/null
+++ b/components/pixz/files/pixz.1
@@ -0,0 +1,139 @@
+'\" te
+.TH pixz 1
+.SH NAME
+pixz \- parallel, indexing version of XZ
+
+.SH SYNOPSIS
+.LP
+.nf
+\fB/usr/bin/pixz\fR input output.pxz
+.fi
+
+.LP
+.nf
+\fB/usr/bin/pixz\fR -d input.pxz output
+.fi
+
+.LP
+.nf
+\fB/usr/bin/pixz\fR -l input.tpxz
+.fi
+
+.LP
+.nf
+\fB/usr/bin/pixz\fR -x /path/to/file < input.tpxz
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+The existing XZ Utils ( http://tukaani.org/xz/ ) provide great compression
+in the .xz file format, but they have two significant problems:
+.sp
+.LP
+.RS +4
+.TP
+.ie t \(bu
+.el o
+They are single-threaded, while most users nowadays have multi-core computers.
+.RE
+.RS +4
+.TP
+.ie t \(bu
+.el o
+The .xz files they produce are just one big block of compressed data, rather than a collection of smaller blocks. This makes random access to the original data impossible.
+.RE
+.sp
+.LP
+With pixz, both these problems are solved.
+
+.SH EXAMPLES
+.sp
+.LP
+Specifying input and output:
+.sp
+.ne 2
+.mk
+.na
+$ pixz < foo.tar > foo.tpxz
+.LP
+
+.sp .6
+.RS 4n
+Same as 'pixz foo.tar foo.tpxz'
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+$ pixz -i foo.tar -o foo.tpxz
+.LP
+
+.sp .6
+.RS 4n
+Ditto. These both work for -x, -d and -l too, eg:
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+$ pixz -x -i foo.tpxz -o foo.tar file1 file2 ...
+.LP
+
+.sp .6
+.RS 4n
+# Extract the files from foo.tpxz into foo.tar
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+$ pixz foo.tar
+.LP
+
+.sp .6
+.RS 4n
+Compress it to foo.tpxz, removing the original
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+$ pixz -d foo.tpxz
+.LP
+
+.sp .6
+.RS 4n
+Extract it to foo.tar, removing the original
+.RE
+
+.SH OPTIONS
+.TP
+.B -1
+Faster, worse compression.
+.TP
+.B -9
+Better, slower compression.
+.TP
+.B -p <number>
+Cap the number of threads at <number>.
+.TP
+.B -t
+Compress but don't treat it as a tarball (don't index it).
+.TP
+.B -d
+Decompress, don't check that contents match index.
+.TP
+.B -l
+List the xz blocks instead of files.
+
+.SH WARNING
+Running pixz without the -t flag will cause it to treat the input
+as a tarball, as long as it looks vaguely tarball-like. This means if the
+file starts with at least 1024 zero bytes, pixz will assume it's empty, and
+truncate the output! If your input files aren't tarballs, run with -t or
+face possible data-loss.
diff --git a/components/pixz/pixz.p5m b/components/pixz/pixz.p5m
new file mode 100644
index 0000000..24a7794
--- /dev/null
+++ b/components/pixz/pixz.p5m
@@ -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 (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability Uncommitted>
+set name=pkg.fmri \
+ value=pkg:/compress/pixz@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="parallel indexing version of XZ"
+set name=pkg.description \
+ value="pixz compresses and decompresses files using multiple processors. If the input looks like a tar(1) archive, it also creates an index of all the files in the archive. This allows the extraction of only a small segment of the tarball, without needing to decompress the entire archive."
+set name=com.oracle.info.description value="parallel indexing version of XZ"
+set name=com.oracle.info.tpno value=11623
+set name=info.classification \
+ value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Dave Vasilevsky <dave@vasilevsky.ca>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2012/358
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file pixz path=usr/bin/pixz
+file pixz.1 path=usr/share/man/man1/pixz.1
+license LICENSE license=BSD-like
diff --git a/components/pixz/resolve.deps b/components/pixz/resolve.deps
new file mode 100644
index 0000000..7e9b7bb
--- /dev/null
+++ b/components/pixz/resolve.deps
@@ -0,0 +1,3 @@
+compress/xz
+library/libarchive
+system/library
diff --git a/components/pylint/Makefile b/components/pylint/Makefile
index b741322..7df3b67 100644
--- a/components/pylint/Makefile
+++ b/components/pylint/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -86,9 +86,9 @@
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
# The tests are run using python 2.7 only and require that
# the python-27 package is installed (does not have to be the default python).
@@ -122,7 +122,7 @@
# 9 modules OK (2 failed)
# failures: smoketest [7/14], unittest_lint [3/21]
-test: $(TEST_32)
+test: $(TEST_NO_ARCH)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
diff --git a/components/python/argparse/Makefile b/components/python/argparse/Makefile
new file mode 100644
index 0000000..8d0dcbb
--- /dev/null
+++ b/components/python/argparse/Makefile
@@ -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 (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME= argparse
+COMPONENT_VERSION= 1.2.1
+COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+ sha256:ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
+COMPONENT_ARCHIVE_URL= http://argparse.googlecode.com/files/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL= http://code.google.com/p/argparse/
+COMPONENT_BUGDB= python-mod/argparse
+
+# The argparse module was integrated into Python 2.7, so we should only deliver
+# a 2.6 module.
+PYTHON_VERSIONS = 2.6
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+# common targets
+build: $(BUILD_32)
+
+install: $(INSTALL_32)
+
+test: $(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
diff --git a/components/python/argparse/argparse-26.p5m b/components/python/argparse/argparse-26.p5m
new file mode 100644
index 0000000..b60a4fc
--- /dev/null
+++ b/components/python/argparse/argparse-26.p5m
@@ -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 (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/argparse-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python argparse command-line parsing library"
+set name=pkg.description \
+ value="The argparse module makes it easy to write user-friendly command-line interfaces. The program defines what arguments it requires, and argparse will figure out how to parse those out of sys.argv. The argparse module also automatically generates help and usage messages and issues errors when users give the program invalid arguments."
+set name=com.oracle.info.description \
+ value="the Python argparse command-line parsing library"
+set name=com.oracle.info.tpno value=13152
+set name=info.classification \
+ value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Steven Bethard <steven.bethard@gmail.com>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2013/096
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/python2.6/vendor-packages/argparse-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/argparse-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/argparse-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/argparse-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+file path=usr/lib/python2.6/vendor-packages/argparse.py
+license argparse.license license=PSFv2
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
+ pkg.debug.depend.path=usr/bin
+
+# force a dependency on the argparse package
+depend type=require \
+ fmri=library/python-2/argparse@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff --git a/components/python/argparse/argparse.license b/components/python/argparse/argparse.license
new file mode 100644
index 0000000..5cdb01e
--- /dev/null
+++ b/components/python/argparse/argparse.license
@@ -0,0 +1,279 @@
+A. HISTORY OF THE SOFTWARE
+==========================
+
+Python was created in the early 1990s by Guido van Rossum at Stichting
+Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
+as a successor of a language called ABC. Guido remains Python's
+principal author, although it includes many contributions from others.
+
+In 1995, Guido continued his work on Python at the Corporation for
+National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
+in Reston, Virginia where he released several versions of the
+software.
+
+In May 2000, Guido and the Python core development team moved to
+BeOpen.com to form the BeOpen PythonLabs team. In October of the same
+year, the PythonLabs team moved to Digital Creations (now Zope
+Corporation, see http://www.zope.com). In 2001, the Python Software
+Foundation (PSF, see http://www.python.org/psf/) was formed, a
+non-profit organization created specifically to own Python-related
+Intellectual Property. Zope Corporation is a sponsoring member of
+the PSF.
+
+All Python releases are Open Source (see http://www.opensource.org for
+the Open Source Definition). Historically, most, but not all, Python
+releases have also been GPL-compatible; the table below summarizes
+the various releases.
+
+ Release Derived Year Owner GPL-
+ from compatible? (1)
+
+ 0.9.0 thru 1.2 1991-1995 CWI yes
+ 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes
+ 1.6 1.5.2 2000 CNRI no
+ 2.0 1.6 2000 BeOpen.com no
+ 1.6.1 1.6 2001 CNRI yes (2)
+ 2.1 2.0+1.6.1 2001 PSF no
+ 2.0.1 2.0+1.6.1 2001 PSF yes
+ 2.1.1 2.1+2.0.1 2001 PSF yes
+ 2.2 2.1.1 2001 PSF yes
+ 2.1.2 2.1.1 2002 PSF yes
+ 2.1.3 2.1.2 2002 PSF yes
+ 2.2.1 2.2 2002 PSF yes
+ 2.2.2 2.2.1 2002 PSF yes
+ 2.2.3 2.2.2 2003 PSF yes
+ 2.3 2.2.2 2002-2003 PSF yes
+ 2.3.1 2.3 2002-2003 PSF yes
+ 2.3.2 2.3.1 2002-2003 PSF yes
+ 2.3.3 2.3.2 2002-2003 PSF yes
+ 2.3.4 2.3.3 2004 PSF yes
+ 2.3.5 2.3.4 2005 PSF yes
+ 2.4 2.3 2004 PSF yes
+ 2.4.1 2.4 2005 PSF yes
+ 2.4.2 2.4.1 2005 PSF yes
+ 2.4.3 2.4.2 2006 PSF yes
+ 2.4.4 2.4.3 2006 PSF yes
+ 2.5 2.4 2006 PSF yes
+ 2.5.1 2.5 2007 PSF yes
+ 2.5.2 2.5.1 2008 PSF yes
+ 2.5.3 2.5.2 2008 PSF yes
+ 2.6 2.5 2008 PSF yes
+ 2.6.1 2.6 2008 PSF yes
+ 2.6.2 2.6.1 2009 PSF yes
+ 2.6.3 2.6.2 2009 PSF yes
+ 2.6.4 2.6.3 2009 PSF yes
+ 2.6.5 2.6.4 2010 PSF yes
+ 2.7 2.6 2010 PSF yes
+
+Footnotes:
+
+(1) GPL-compatible doesn't mean that we're distributing Python under
+ the GPL. All Python licenses, unlike the GPL, let you distribute
+ a modified version without making your changes open source. The
+ GPL-compatible licenses make it possible to combine Python with
+ other software that is released under the GPL; the others don't.
+
+(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
+ because its license has a choice of law clause. According to
+ CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
+ is "not incompatible" with the GPL.
+
+Thanks to the many outside volunteers who have worked under Guido's
+direction to make these releases possible.
+
+
+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
+===============================================================
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Python Software Foundation; All Rights Reserved" are retained in Python alone or
+in any derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee. This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
+-------------------------------------------
+
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+
+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+Individual or Organization ("Licensee") accessing and otherwise using
+this software in source or binary form and its associated
+documentation ("the Software").
+
+2. Subject to the terms and conditions of this BeOpen Python License
+Agreement, BeOpen hereby grants Licensee a non-exclusive,
+royalty-free, world-wide license to reproduce, analyze, test, perform
+and/or display publicly, prepare derivative works, distribute, and
+otherwise use the Software alone or in any derivative version,
+provided, however, that the BeOpen Python License is retained in the
+Software, alone or in any derivative version prepared by Licensee.
+
+3. BeOpen is making the Software available to Licensee on an "AS IS"
+basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+5. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+6. This License Agreement shall be governed by and interpreted in all
+respects by the law of the State of California, excluding conflict of
+law provisions. Nothing in this License Agreement shall be deemed to
+create any relationship of agency, partnership, or joint venture
+between BeOpen and Licensee. This License Agreement does not grant
+permission to use BeOpen trademarks or trade names in a trademark
+sense to endorse or promote products or services of Licensee, or any
+third party. As an exception, the "BeOpen Python" logos available at
+http://www.pythonlabs.com/logos.html may be used according to the
+permissions granted on that web page.
+
+7. By copying, installing or otherwise using the software, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
+---------------------------------------
+
+1. This LICENSE AGREEMENT is between the Corporation for National
+Research Initiatives, having an office at 1895 Preston White Drive,
+Reston, VA 20191 ("CNRI"), and the Individual or Organization
+("Licensee") accessing and otherwise using Python 1.6.1 software in
+source or binary form and its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, CNRI
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 1.6.1
+alone or in any derivative version, provided, however, that CNRI's
+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
+1995-2001 Corporation for National Research Initiatives; All Rights
+Reserved" are retained in Python 1.6.1 alone or in any derivative
+version prepared by Licensee. Alternately, in lieu of CNRI's License
+Agreement, Licensee may substitute the following text (omitting the
+quotes): "Python 1.6.1 is made available subject to the terms and
+conditions in CNRI's License Agreement. This Agreement together with
+Python 1.6.1 may be located on the Internet using the following
+unique, persistent identifier (known as a handle): 1895.22/1013. This
+Agreement may also be obtained from a proxy server on the Internet
+using the following URL: http://hdl.handle.net/1895.22/1013".
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 1.6.1 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 1.6.1.
+
+4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
+basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. This License Agreement shall be governed by the federal
+intellectual property law of the United States, including without
+limitation the federal copyright law, and, to the extent such
+U.S. federal law does not apply, by the law of the Commonwealth of
+Virginia, excluding Virginia's conflict of law provisions.
+Notwithstanding the foregoing, with regard to derivative works based
+on Python 1.6.1 that incorporate non-separable material that was
+previously distributed under the GNU General Public License (GPL), the
+law of the Commonwealth of Virginia shall govern this License
+Agreement only as to issues arising under or with respect to
+Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
+License Agreement shall be deemed to create any relationship of
+agency, partnership, or joint venture between CNRI and Licensee. This
+License Agreement does not grant permission to use CNRI trademarks or
+trade name in a trademark sense to endorse or promote products or
+services of Licensee, or any third party.
+
+8. By clicking on the "ACCEPT" button where indicated, or by copying,
+installing or otherwise using Python 1.6.1, Licensee agrees to be
+bound by the terms and conditions of this License Agreement.
+
+ ACCEPT
+
+
+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
+--------------------------------------------------
+
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+The Netherlands. All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Stichting Mathematisch
+Centrum or CWI not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/components/python/argparse/argparse.p5m b/components/python/argparse/argparse.p5m
new file mode 100644
index 0000000..1b39190
--- /dev/null
+++ b/components/python/argparse/argparse.p5m
@@ -0,0 +1,40 @@
+#
+# 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 (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/argparse@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python argparse command-line parsing library"
+set name=pkg.description \
+ value="The argparse module makes it easy to write user-friendly command-line interfaces. The program defines what arguments it requires, and argparse will figure out how to parse those out of sys.argv. The argparse module also automatically generates help and usage messages and issues errors when users give the program invalid arguments."
+set name=com.oracle.info.description \
+ value="the Python argparse command-line parsing library"
+set name=info.classification \
+ value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Steven Bethard <steven.bethard@gmail.com>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2013/096
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=conditional \
+ fmri=library/python-2/argparse-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26
diff --git a/components/python/argparse/resolve.deps b/components/python/argparse/resolve.deps
new file mode 100644
index 0000000..ee1b6a8
--- /dev/null
+++ b/components/python/argparse/resolve.deps
@@ -0,0 +1 @@
+runtime/python-26
diff --git a/components/python/cherrypy/Makefile b/components/python/cherrypy/Makefile
index d325ef3..33e457b 100644
--- a/components/python/cherrypy/Makefile
+++ b/components/python/cherrypy/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -45,9 +45,9 @@
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
test: $(NO_TESTS)
diff --git a/components/python/cssutils/Makefile b/components/python/cssutils/Makefile
index 43a3f76..c28bc4e 100644
--- a/components/python/cssutils/Makefile
+++ b/components/python/cssutils/Makefile
@@ -39,6 +39,9 @@
include $(WS_TOP)/make-rules/setup.py.mk
include $(WS_TOP)/make-rules/ips.mk
+COMPONENT_TEST_DIR= $(COMPONENT_SRC)
+COMPONENT_TEST_ARGS= ./setup.py test
+
# Remove the trailing Control-M's from the Python source files.
COMPONENT_PRE_BUILD_ACTION = \
/usr/bin/find $(SOURCE_DIR)/src \
@@ -67,12 +70,11 @@
COMPONENT_PRE_INSTALL_ACTION = \
(cd $(SOURCE_DIR); $(RM) -r src ; $(CP) -rp src-$(PYTHON_VERSION) src )
-# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
-test: $(NO_TESTS)
+test: $(TEST_NO_ARCH)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
diff --git a/components/python/decorator/Makefile b/components/python/decorator/Makefile
index e3fad10..8124412 100644
--- a/components/python/decorator/Makefile
+++ b/components/python/decorator/Makefile
@@ -38,9 +38,9 @@
include $(WS_TOP)/make-rules/ips.mk
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
test: $(NO_TESTS)
diff --git a/components/python/imaging/Makefile b/components/python/imaging/Makefile
index ab6b359..fb6a103 100644
--- a/components/python/imaging/Makefile
+++ b/components/python/imaging/Makefile
@@ -39,12 +39,21 @@
include $(WS_TOP)/make-rules/setup.py.mk
include $(WS_TOP)/make-rules/ips.mk
+TEST_PYTHONPATH.32 = $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL
+TEST_PYTHONPATH.64 = $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL:$(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL/64
+
+COMPONENT_TEST_DIR= $(COMPONENT_SRC)
+COMPONENT_TEST_ARGS= ./selftest.py
+COMPONENT_TEST_ENV= PYTHONPATH=$(TEST_PYTHONPATH.$(BITS))
+
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
-test: $(NO_TESTS)
+test: $(TEST_32_and_64)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
diff --git a/components/python/jsonrpclib/Makefile b/components/python/jsonrpclib/Makefile
index 17507b1..59671ef 100644
--- a/components/python/jsonrpclib/Makefile
+++ b/components/python/jsonrpclib/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -40,9 +40,9 @@
include $(WS_TOP)/make-rules/ips.mk
# common targets
-build: $(BUILD_32_and_64)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32_and_64)
+install: $(INSTALL_NO_ARCH)
test: $(NO_TESTS)
diff --git a/components/python/ldtp/Makefile b/components/python/ldtp/Makefile
index 3e4e64a..34372b9 100644
--- a/components/python/ldtp/Makefile
+++ b/components/python/ldtp/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -44,9 +44,9 @@
(cd $(PROTO_DIR)/usr/bin ; $(MV) -f ldtp ldtp$(PYTHON_VERSION))
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
test: $(NO_TESTS)
diff --git a/components/python/mako/Makefile b/components/python/mako/Makefile
index 64a1031..a20b137 100644
--- a/components/python/mako/Makefile
+++ b/components/python/mako/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -39,9 +39,9 @@
include $(WS_TOP)/make-rules/ips.mk
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
test: $(NO_TESTS)
diff --git a/components/python/mock/Makefile b/components/python/mock/Makefile
index 62600fc..f654663 100644
--- a/components/python/mock/Makefile
+++ b/components/python/mock/Makefile
@@ -36,13 +36,15 @@
include $(WS_TOP)/make-rules/setup.py.mk
include $(WS_TOP)/make-rules/ips.mk
+COMPONENT_TEST_DIR = $(SOURCE_DIR)
+COMPONENT_TEST_ARGS = setup.py test
+
# common targets
-build: $(BUILD_32_and_64)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32_and_64)
+install: $(INSTALL_NO_ARCH)
-test: $(BUILD_32_and_64)
- cd $(SOURCE_DIR) && $(PYTHON) setup.py test
+test: $(TEST_NO_ARCH)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
diff --git a/components/python/netaddr/Makefile b/components/python/netaddr/Makefile
new file mode 100644
index 0000000..3b7b6e8
--- /dev/null
+++ b/components/python/netaddr/Makefile
@@ -0,0 +1,58 @@
+#
+# 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 (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME= netaddr
+COMPONENT_VERSION= 0.7.10
+COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+ sha256:9b79763141a855079b0589717696a4ccb5c56c0b807b6e584bfe12333399e0b7
+COMPONENT_PROJECT_URL= http://github.com/drkjam/netaddr/
+COMPONENT_ARCHIVE_URL= http://github.com/downloads/drkjam/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB= python-mod/netaddr
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+COMPONENT_POST_INSTALL_ACTION = \
+ (cd $(PROTOUSRBINDIR) ; $(MV) netaddr netaddr-$(PYTHON_VERSION))
+
+# common targets
+build: $(BUILD_NO_ARCH)
+
+install: $(INSTALL_NO_ARCH)
+
+COMPONENT_TEST_DIR= $(@D)/lib/netaddr
+COMPONENT_TEST_ARGS= tests/__init__.py
+COMPONENT_PRE_TEST_ACTION= \
+ ( cd $(COMPONENT_TEST_DIR)/tests ; \
+ ln -s $(SOURCE_DIR)/netaddr/tests/2.x ; \
+ ln -s $(SOURCE_DIR)/netaddr/tests/3.x )
+
+test: $(TEST_NO_ARCH)
+
+BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
diff --git a/components/python/netaddr/netaddr-PYVER.p5m b/components/python/netaddr/netaddr-PYVER.p5m
new file mode 100644
index 0000000..e91e64d
--- /dev/null
+++ b/components/python/netaddr/netaddr-PYVER.p5m
@@ -0,0 +1,81 @@
+#
+# 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 (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/netaddr-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python network address manipulation"
+set name=pkg.description \
+ value="The netaddr Python library represents and manipulates network addresses. It supports the ability to work and interact with the following: IPv4 and IPv6 addresses and subnets; MAC addresses, OUI and IAB identifiers, IEEE EUI-64 identifiers; arbitrary (non-aligned) IP address ranges and IP address sets; various non-CIDR IP range formats such as nmap and glob-style formats."
+set name=com.oracle.info.description \
+ value="the Python network address manipulation library"
+set name=com.oracle.info.tpno value=13141
+set name=info.classification \
+ value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2012/037
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+link path=usr/bin/netaddr target=netaddr-$(PYVER) mediator=python \
+ mediator-version=$(PYVER)
+#
+# since we have IPython < 0.11, skip dependencies for
+# IPython.frontend.terminal.embed
+file path=usr/bin/netaddr-$(PYVER) \
+ pkg.depend.bypass-generate=.*(frontend|terminal|embed).*
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr-$(IPS_COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/eui/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/eui/iab.idx
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/eui/iab.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/eui/ieee.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/eui/oui.idx
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/eui/oui.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/fbsocket.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/ip/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/ip/glob.py
+# urllib.request is not available in python 2.X
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/ip/iana.py \
+ pkg.depend.bypass-generate=.*(urllib|request).*
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/ip/intset.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/ip/ipv4-address-space.xml
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/ip/ipv6-address-space.xml
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/ip/multicast-addresses.xml
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/ip/nmap.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/ip/rfc1924.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/ip/sets.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/strategy/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/strategy/eui48.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/strategy/eui64.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/strategy/ipv4.py
+file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/strategy/ipv6.py
+#
+license LICENSE license=BSD
+#
+# force a dependency on the netaddr package
+depend type=require \
+ fmri=library/python-2/netaddr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff --git a/components/python/netaddr/resolve.deps b/components/python/netaddr/resolve.deps
new file mode 100644
index 0000000..f49cb78
--- /dev/null
+++ b/components/python/netaddr/resolve.deps
@@ -0,0 +1,4 @@
+library/python-2/ipython-26
+library/python-2/ipython-27
+runtime/python-26
+runtime/python-27
diff --git a/components/python/nose/Makefile b/components/python/nose/Makefile
index 507e531..ac30ff1 100644
--- a/components/python/nose/Makefile
+++ b/components/python/nose/Makefile
@@ -40,9 +40,9 @@
include $(WS_TOP)/make-rules/ips.mk
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
test: $(NO_TESTS)
diff --git a/components/python/pep8/Makefile b/components/python/pep8/Makefile
index a7eae4e..6b397fd 100644
--- a/components/python/pep8/Makefile
+++ b/components/python/pep8/Makefile
@@ -56,9 +56,9 @@
(cd $(PROTO_DIR)/usr/bin ; $(MV) -f pep8 pep8-$(PYTHON_VERSION))
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
test: $(NO_TESTS)
diff --git a/components/python/ply/Makefile b/components/python/ply/Makefile
index 17ef4e9..3e16e2d 100644
--- a/components/python/ply/Makefile
+++ b/components/python/ply/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -39,9 +39,9 @@
include $(WS_TOP)/make-rules/ips.mk
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
test: $(NO_TESTS)
diff --git a/components/python/pybonjour/Makefile b/components/python/pybonjour/Makefile
index 7b964d1..3fd2c55 100644
--- a/components/python/pybonjour/Makefile
+++ b/components/python/pybonjour/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -39,9 +39,9 @@
include $(WS_TOP)/make-rules/ips.mk
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
test: $(NO_TESTS)
diff --git a/components/python/python26/Makefile b/components/python/python26/Makefile
index 08f573d..7ad8967 100644
--- a/components/python/python26/Makefile
+++ b/components/python/python26/Makefile
@@ -113,6 +113,8 @@
$(MV) include/python2.6/pyconfig.h include/python2.6/pyconfig-$(BITS).h ; \
$(TOUCH) lib/python2.6/lib2to3/*.pickle)
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
$(INSTALL_32): $(INSTALL_64)
build: $(BUILD_32_and_64)
diff --git a/components/python/python26/python-26-tests.p5m b/components/python/python26/python-26-tests.p5m
index e62c7c2..95d86cf 100644
--- a/components/python/python26/python-26-tests.p5m
+++ b/components/python/python26/python-26-tests.p5m
@@ -38,6 +38,28 @@
set pkg.linted.pkglint.manifest004=true
+file path=usr/lib/python2.6/bsddb/test/__init__.py
+file path=usr/lib/python2.6/bsddb/test/test_all.py
+file path=usr/lib/python2.6/bsddb/test/test_associate.py
+file path=usr/lib/python2.6/bsddb/test/test_basics.py
+file path=usr/lib/python2.6/bsddb/test/test_compare.py
+file path=usr/lib/python2.6/bsddb/test/test_compat.py
+file path=usr/lib/python2.6/bsddb/test/test_cursor_pget_bug.py
+file path=usr/lib/python2.6/bsddb/test/test_dbobj.py
+file path=usr/lib/python2.6/bsddb/test/test_dbshelve.py
+file path=usr/lib/python2.6/bsddb/test/test_dbtables.py
+file path=usr/lib/python2.6/bsddb/test/test_distributed_transactions.py
+file path=usr/lib/python2.6/bsddb/test/test_early_close.py
+file path=usr/lib/python2.6/bsddb/test/test_get_none.py
+file path=usr/lib/python2.6/bsddb/test/test_join.py
+file path=usr/lib/python2.6/bsddb/test/test_lock.py
+file path=usr/lib/python2.6/bsddb/test/test_misc.py
+file path=usr/lib/python2.6/bsddb/test/test_pickle.py
+file path=usr/lib/python2.6/bsddb/test/test_queue.py
+file path=usr/lib/python2.6/bsddb/test/test_recno.py
+file path=usr/lib/python2.6/bsddb/test/test_replication.py
+file path=usr/lib/python2.6/bsddb/test/test_sequence.py
+file path=usr/lib/python2.6/bsddb/test/test_thread.py
file path=usr/lib/python2.6/ctypes/test/__init__.py
file path=usr/lib/python2.6/ctypes/test/runtests.py
file path=usr/lib/python2.6/ctypes/test/test_anon.py
@@ -104,12 +126,15 @@
file path=usr/lib/python2.6/distutils/tests/test_dist.py
file path=usr/lib/python2.6/distutils/tests/test_filelist.py
file path=usr/lib/python2.6/distutils/tests/test_install.py
+file path=usr/lib/python2.6/distutils/tests/test_install_lib.py
file path=usr/lib/python2.6/distutils/tests/test_install_scripts.py
file path=usr/lib/python2.6/distutils/tests/test_msvc9compiler.py
file path=usr/lib/python2.6/distutils/tests/test_register.py
file path=usr/lib/python2.6/distutils/tests/test_sdist.py
file path=usr/lib/python2.6/distutils/tests/test_sysconfig.py
+file path=usr/lib/python2.6/distutils/tests/test_unixccompiler.py
file path=usr/lib/python2.6/distutils/tests/test_upload.py
+file path=usr/lib/python2.6/distutils/tests/test_util.py
file path=usr/lib/python2.6/distutils/tests/test_versionpredicate.py
file path=usr/lib/python2.6/email/test/__init__.py
file path=usr/lib/python2.6/email/test/data/PyBanner048.gif
@@ -159,6 +184,8 @@
file path=usr/lib/python2.6/email/test/data/msg_42.txt
file path=usr/lib/python2.6/email/test/data/msg_43.txt
file path=usr/lib/python2.6/email/test/data/msg_44.txt
+file path=usr/lib/python2.6/email/test/data/msg_45.txt
+file path=usr/lib/python2.6/email/test/data/msg_46.txt
file path=usr/lib/python2.6/email/test/test_email.py
file path=usr/lib/python2.6/email/test/test_email_codecs.py
file path=usr/lib/python2.6/email/test/test_email_codecs_renamed.py
@@ -396,6 +423,7 @@
file path=usr/lib/python2.6/test/inspect_fodder2.py
file path=usr/lib/python2.6/test/keycert.pem
file path=usr/lib/python2.6/test/list_tests.py
+file path=usr/lib/python2.6/test/lock_tests.py
file path=usr/lib/python2.6/test/mapping_tests.py
file path=usr/lib/python2.6/test/nullcert.pem
file path=usr/lib/python2.6/test/outstanding_bugs.py
@@ -417,6 +445,7 @@
file path=usr/lib/python2.6/test/sample_doctest.py
file path=usr/lib/python2.6/test/seq_tests.py
file path=usr/lib/python2.6/test/sgml_input.html
+file path=usr/lib/python2.6/test/sha256.pem
file path=usr/lib/python2.6/test/sortperf.py
file path=usr/lib/python2.6/test/ssl_cert.pem
file path=usr/lib/python2.6/test/ssl_key.pem
@@ -690,6 +719,7 @@
file path=usr/lib/python2.6/test/test_quopri.py
file path=usr/lib/python2.6/test/test_random.py
file path=usr/lib/python2.6/test/test_re.py
+file path=usr/lib/python2.6/test/test_readline.py
file path=usr/lib/python2.6/test/test_repr.py
file path=usr/lib/python2.6/test/test_resource.py
file path=usr/lib/python2.6/test/test_rfc822.py
diff --git a/components/python/python26/python-26.p5m b/components/python/python26/python-26.p5m
index c60c4c8..12c42e6 100644
--- a/components/python/python26/python-26.p5m
+++ b/components/python/python26/python-26.p5m
@@ -44,6 +44,8 @@
file usr/bin/idle path=usr/bin/idle-2.6
file usr/bin/pydoc path=usr/bin/pydoc-2.6
file path=usr/bin/python2.6-config
+#file path=usr/bin/smtpd.py pkg.tmp.autopyc=false
+#file path=usr/bin/$(MACH64)/smtpd.py pkg.tmp.autopyc=false
file path=usr/include/python2.6/Python-ast.h
file path=usr/include/python2.6/Python.h
@@ -178,6 +180,13 @@
file path=usr/lib/python2.6/bdb.py
file path=usr/lib/python2.6/binhex.py
file path=usr/lib/python2.6/bisect.py
+file path=usr/lib/python2.6/bsddb/__init__.py
+file path=usr/lib/python2.6/bsddb/db.py
+file path=usr/lib/python2.6/bsddb/dbobj.py
+file path=usr/lib/python2.6/bsddb/dbrecio.py
+file path=usr/lib/python2.6/bsddb/dbshelve.py
+file path=usr/lib/python2.6/bsddb/dbtables.py
+file path=usr/lib/python2.6/bsddb/dbutils.py
file path=usr/lib/python2.6/cProfile.py pkg.depend.bypass-generate=.*
file path=usr/lib/python2.6/calendar.py
file path=usr/lib/python2.6/cgi.py
diff --git a/components/python/python27/Makefile b/components/python/python27/Makefile
index 5082368..46811c0 100644
--- a/components/python/python27/Makefile
+++ b/components/python/python27/Makefile
@@ -118,6 +118,8 @@
$(MV) include/python2.7/pyconfig.h include/python2.7/pyconfig-$(BITS).h ; \
$(TOUCH) lib/python2.7/lib2to3/*.pickle)
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
$(INSTALL_32): $(INSTALL_64)
build: $(BUILD_32_and_64)
diff --git a/components/python/setuptools/Makefile b/components/python/setuptools/Makefile
index bb6dc76..ef57ce3 100644
--- a/components/python/setuptools/Makefile
+++ b/components/python/setuptools/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -41,9 +41,9 @@
include $(WS_TOP)/make-rules/ips.mk
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
test: $(NO_TESTS)
diff --git a/components/python/simplejson/Makefile b/components/python/simplejson/Makefile
index 36decb8..e90cc53 100644
--- a/components/python/simplejson/Makefile
+++ b/components/python/simplejson/Makefile
@@ -39,12 +39,17 @@
include $(WS_TOP)/make-rules/setup.py.mk
include $(WS_TOP)/make-rules/ips.mk
+COMPONENT_TEST_DIR= $(COMPONENT_SRC)
+COMPONENT_TEST_ARGS= ./setup.py test
+
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
-test: $(NO_TESTS)
+test: $(TEST_32_and_64)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
diff --git a/components/python/twisted-web2/Makefile b/components/python/twisted-web2/Makefile
index 8859e2c..d3eb7d3 100644
--- a/components/python/twisted-web2/Makefile
+++ b/components/python/twisted-web2/Makefile
@@ -40,9 +40,9 @@
include $(WS_TOP)/make-rules/ips.mk
# common targets
-build: $(BUILD_32)
+build: $(BUILD_NO_ARCH)
-install: $(INSTALL_32)
+install: $(INSTALL_NO_ARCH)
test: $(NO_TESTS)
diff --git a/components/python/twisted/Makefile b/components/python/twisted/Makefile
index a169e62..bcc8cb3 100644
--- a/components/python/twisted/Makefile
+++ b/components/python/twisted/Makefile
@@ -39,6 +39,12 @@
include $(WS_TOP)/make-rules/setup.py.mk
include $(WS_TOP)/make-rules/ips.mk
+COMPONENT_TEST_DIR= $(COMPONENT_SRC)
+COMPONENT_TEST_CMD= $(@D)/scripts-2.6/trial twisted
+COMPONENT_TEST_ARGS=""
+
+ASLR_MODE = $(ASLR_ENABLE)
+
# common targets
build: $(BUILD_32_and_64)
@@ -51,7 +57,7 @@
# $ ../build/i86-2.6/scripts-2.6/trial twisted
# $ ../build/i86-2.7/scripts-2.7/trial twisted
#
-test: $(NO_TESTS)
+test: $(TEST_32_and_64)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
diff --git a/components/rdiff-backup/Makefile b/components/rdiff-backup/Makefile
index 305a16f..14852d0 100644
--- a/components/rdiff-backup/Makefile
+++ b/components/rdiff-backup/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -38,16 +38,26 @@
include $(WS_TOP)/make-rules/ips.mk
include $(WS_TOP)/make-rules/setup.py.mk
-## just build a Python 2.6 version for now, when the 2.7 modules show up, we can
-## switch
-#PYTHON_VERSIONS = 2.6
-#PYTHON_DATA = /usr
+# Needed to get around a broken /usr/lib/python2.7/config/Makefile
+# See CR #16837431.
+LD=$(CC)
+LDSHARED=$(CC) -G $(CC_BITS)
+CFLAGS= $(CC_BITS)
+CPPFLAGS=
+LDFLAGS=
+PYTHON_ENV += CC="$(CC)"
+PYTHON_ENV += LDSHARED="$(LDSHARED)"
+PYTHON_ENV += LD="$(LD)"
+PYTHON_ENV += CFLAGS="$(CFLAGS)"
+PYTHON_ENV += CPPFLAGS="$(CPPFLAGS)"
+PYTHON_ENV += LDFLAGS="$(LDFLAGS)"
+COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
# common targets
-build: $(BUILD_32)
+build: $(BUILD_64)
-install: $(INSTALL_32)
+install: $(INSTALL_64)
test: $(NO_TESTS)
diff --git a/components/rdiff-backup/rdiff-backup-26.p5m b/components/rdiff-backup/rdiff-backup-26.p5m
deleted file mode 100644
index 955f91f..0000000
--- a/components/rdiff-backup/rdiff-backup-26.p5m
+++ /dev/null
@@ -1,94 +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 (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/backup/rdiff-backup-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Local/remote mirror and incremental backup utility"
-set name=com.oracle.info.description value="Python 2.6 bindings for rdiff-backup"
-set name=com.oracle.info.tpno value=9055
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2008/272
-
-license rdiff-backup.copyright license="GPLv2"
-
-
-file build/$(MACH32)-2.6/scripts-2.6/rdiff-backup \
- path=usr/bin/rdiff-backup-2.6 \
- pkg.depend.bypass-generate=.*msvcrt.*
-file build/$(MACH32)-2.6/scripts-2.6/rdiff-backup-statistics \
- path=usr/bin/rdiff-backup-statistics-2.6
-file \
- path=usr/lib/python2.6/vendor-packages/rdiff_backup-$(COMPONENT_VERSION)-py2.6.egg-info
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/C.so
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/FilenameMapping.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Globals.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Hardlink.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Main.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Rdiff.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Security.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/SetConnections.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/TempFile.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Time.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/__init__.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/_librsync.so
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/backup.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/compare.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/connection.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/eas_acls.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/fs_abilities.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/hash.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/increment.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/iterfile.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/lazy.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/librsync.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/log.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/longname.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/manage.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/metadata.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/regress.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/restore.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/robust.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/rorpiter.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/rpath.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/selection.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/static.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/statistics.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/user_group.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/win_acls.py
-
-link path=usr/bin/rdiff-backup target=rdiff-backup-2.6 \
- mediator=python mediator-version=2.6
-
-link path=usr/bin/rdiff-backup-statistics target=rdiff-backup-statistics-2.6 \
- mediator=python mediator-version=2.6
-
-# force a dependency on the Python 2.6 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.6 \
- pkg.debug.depend.path=usr/bin type=require
-
-# force a dependency on the rdiff-backup package
-depend fmri=backup/rdiff-backup@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
diff --git a/components/rdiff-backup/rdiff-backup-27.p5m b/components/rdiff-backup/rdiff-backup-27.p5m
deleted file mode 100644
index 81880af..0000000
--- a/components/rdiff-backup/rdiff-backup-27.p5m
+++ /dev/null
@@ -1,94 +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 (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/backup/rdiff-backup-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Local/remote mirror and incremental backup utility"
-set name=com.oracle.info.description value="Python 2.7 bindings for rdiff-backup"
-set name=com.oracle.info.tpno value=9055
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2008/272
-
-license rdiff-backup.copyright license="GPLv2"
-
-
-file build/$(MACH32)-2.7/scripts-2.7/rdiff-backup \
- path=usr/bin/rdiff-backup-2.7 \
- pkg.depend.bypass-generate=.*msvcrt.*
-file build/$(MACH32)-2.7/scripts-2.7/rdiff-backup-statistics \
- path=usr/bin/rdiff-backup-statistics-2.7
-file \
- path=usr/lib/python2.7/vendor-packages/rdiff_backup-$(COMPONENT_VERSION)-py2.7.egg-info
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/C.so
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/FilenameMapping.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Globals.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Hardlink.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Main.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Rdiff.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Security.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/SetConnections.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/TempFile.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Time.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/__init__.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/_librsync.so
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/backup.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/compare.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/connection.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/eas_acls.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/fs_abilities.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/hash.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/increment.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/iterfile.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/lazy.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/librsync.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/log.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/longname.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/manage.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/metadata.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/regress.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/restore.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/robust.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/rorpiter.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/rpath.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/selection.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/static.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/statistics.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/user_group.py
-file path=usr/lib/python2.7/vendor-packages/rdiff_backup/win_acls.py
-
-link path=usr/bin/rdiff-backup target=rdiff-backup-2.7 \
- mediator=python mediator-version=2.7
-
-link path=usr/bin/rdiff-backup-statistics target=rdiff-backup-statistics-2.7 \
- mediator=python mediator-version=2.7
-
-# force a dependency on the Python 2.7 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.7 \
- pkg.debug.depend.path=usr/bin type=require
-
-# force a dependency on the rdiff-backup package
-depend fmri=backup/rdiff-backup@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
diff --git a/components/rdiff-backup/rdiff-backup-GENFRAG.p5m b/components/rdiff-backup/rdiff-backup-GENFRAG.p5m
new file mode 100644
index 0000000..f49b189
--- /dev/null
+++ b/components/rdiff-backup/rdiff-backup-GENFRAG.p5m
@@ -0,0 +1,31 @@
+#
+# 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 (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+file CHANGELOG path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/CHANGELOG
+file COPYING path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/COPYING
+file FAQ.html path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/FAQ.html
+file README path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/README
+file rdiff-backup-statistics.1 path=usr/share/man/man1/rdiff-backup-statistics.1
+file rdiff-backup.1 path=usr/share/man/man1/rdiff-backup.1
+license rdiff-backup.copyright license=GPLv2
diff --git a/components/rdiff-backup/rdiff-backup-PYVER.p5m b/components/rdiff-backup/rdiff-backup-PYVER.p5m
new file mode 100644
index 0000000..f657a98
--- /dev/null
+++ b/components/rdiff-backup/rdiff-backup-PYVER.p5m
@@ -0,0 +1,87 @@
+#
+# 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 (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/backup/rdiff-backup-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Local/remote mirror and incremental backup utility"
+set name=com.oracle.info.summary value="Python bindings for rdiff-backup"
+set name=com.oracle.info.tpno value=9055
+set name=info.classification \
+ value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2008/272
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/rdiff-backup target=rdiff-backup-$(PYVER) mediator=python \
+ mediator-version=$(PYVER)
+
+
+file build/$(MACH64)-$(PYVER)/scripts-$(PYVER)/rdiff-backup \
+ path=usr/bin/rdiff-backup-$(PYVER) pkg.depend.bypass-generate=.*msvcrt.*
+link path=usr/bin/rdiff-backup-statistics \
+ target=rdiff-backup-statistics-$(PYVER) mediator=python \
+ mediator-version=$(PYVER)
+file build/$(MACH64)-$(PYVER)/scripts-$(PYVER)/rdiff-backup-statistics \
+ path=usr/bin/rdiff-backup-statistics-$(PYVER)
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/64/C.so
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/FilenameMapping.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/Globals.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/Hardlink.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/Main.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/Rdiff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/Security.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/SetConnections.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/TempFile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/Time.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/64/_librsync.so
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/backup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/compare.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/connection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/eas_acls.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/fs_abilities.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/hash.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/increment.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/iterfile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/lazy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/librsync.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/log.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/longname.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/manage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/metadata.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/regress.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/restore.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/robust.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/rorpiter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/rpath.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/selection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/static.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/statistics.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/user_group.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rdiff_backup/win_acls.py
+license rdiff-backup.copyright license=GPLv2
+
+# force a dependency on the rdiff-backup package
+depend type=require \
+ fmri=backup/rdiff-backup@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff --git a/components/rdiff-backup/rdiff-backup.p5m b/components/rdiff-backup/rdiff-backup.p5m
deleted file mode 100644
index 770000f..0000000
--- a/components/rdiff-backup/rdiff-backup.p5m
+++ /dev/null
@@ -1,52 +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 (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
-set name=pkg.fmri value=pkg:/backup/rdiff-backup@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Local/remote mirror and incremental backup utility"
-set name=com.oracle.info.description value="the rdiff-backup file utility"
-set name=com.oracle.info.tpno value=9055
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2008/272
-
-license rdiff-backup.copyright license="GPLv2"
-
-
-file CHANGELOG path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/CHANGELOG
-file COPYING path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/COPYING
-file FAQ.html path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/FAQ.html
-file README path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/README
-file rdiff-backup-statistics.1 path=usr/share/man/man1/rdiff-backup-statistics.1
-file rdiff-backup.1 path=usr/share/man/man1/rdiff-backup.1
-
-depend fmri=backup/rdiff-backup-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-26 \
- type=conditional
-depend fmri=backup/rdiff-backup-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-27 \
- type=conditional
diff --git a/components/samba/samba/Makefile b/components/samba/samba/Makefile
index f2e0fd8..1b3a5cb 100644
--- a/components/samba/samba/Makefile
+++ b/components/samba/samba/Makefile
@@ -26,11 +26,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= samba
-COMPONENT_VERSION= 3.6.12
+COMPONENT_VERSION= 3.6.15
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL= http://www.samba.org/
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:6ff797c1772613bd5172d2c8b900fd56bf096d7252faee8b47c4925a4fdc9f8b
+COMPONENT_ARCHIVE_HASH= sha256:42b9acb13f8760a1767829ebaa4c371e462aad5287caf92887e64930cf27da60
COMPONENT_ARCHIVE_URL= http://us1.samba.org/samba/ftp/stable/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/samba
diff --git a/components/samba/samba/samba.p5m b/components/samba/samba/samba.p5m
index 0684cdb..47e0021 100644
--- a/components/samba/samba/samba.p5m
+++ b/components/samba/samba/samba.p5m
@@ -24,7 +24,7 @@
set name=pkg.fmri value=pkg:/service/network/samba@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="samba - A Windows SMB/CIFS fileserver for UNIX"
set name=com.oracle.info.description value="Samba, a SMB/CIFS fileserver"
-set name=com.oracle.info.tpno value=12677
+set name=com.oracle.info.tpno value=13398
set name=info.classification value="org.opensolaris.category.2008:System/File System"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
diff --git a/components/spawn-fcgi/Makefile b/components/spawn-fcgi/Makefile
index 8aff491..e3de776 100644
--- a/components/spawn-fcgi/Makefile
+++ b/components/spawn-fcgi/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -39,11 +39,14 @@
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
+CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
+
+ASLR_MODE = $(ASLR_ENABLE)
# common targets
-build: $(BUILD_32)
+build: $(BUILD_64)
-install: $(INSTALL_32)
+install: $(INSTALL_64)
test: $(NO_TESTS)
diff --git a/components/spawn-fcgi/spawn-fcgi.p5m b/components/spawn-fcgi/spawn-fcgi.p5m
index 5171df1..4e75458 100644
--- a/components/spawn-fcgi/spawn-fcgi.p5m
+++ b/components/spawn-fcgi/spawn-fcgi.p5m
@@ -35,6 +35,6 @@
set name=org.opensolaris.arc-caseid \
value=LSARC/2009/562
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/spawn-fcgi
+file usr/bin/$(MACH64)/spawn-fcgi path=usr/bin/spawn-fcgi
file path=usr/share/man/man1/spawn-fcgi.1
license spawn-fcgi.license license=BSD
diff --git a/components/squid/Makefile b/components/squid/Makefile
index 595c58a..5aab76d 100644
--- a/components/squid/Makefile
+++ b/components/squid/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -28,12 +28,12 @@
PATH=/usr/bin:/usr/gnu/bin:/usr/sbin:/usr/perl5/bin
COMPONENT_NAME= squid
-COMPONENT_VERSION= 3.1.18
+COMPONENT_VERSION= 3.1.23
COMPONENT_PROJECT_URL= http://www.squid-cache.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= \
- sha256:6a7122514d58c3077f2b43c928864be10753d8e2c8439133dacc9eba6c45e00d
+ sha256:ba5f6a7000a032f2315923c1b8d0b37458d33a7f59d603facecf9e8c12470b34
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)Versions/v3/3.1/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/squid
@@ -89,13 +89,40 @@
COMPONENT_POST_BUILD_ACTION= \
(cd $(COMPONENT_DIR) ; \
- $(CP) squid.conf.default $(@D)/src)
+ $(CP) files/squid.conf.default $(@D)/src)
# common targets
build: $(BUILD_32)
install: $(INSTALL_32)
-
+
+# configure says it needs cppunit to test with.
+# After some work I can get cppunit to build but it quickly
+# falls over during test so giving up.
+# I don't think the test suite really tests squid's functionality anyways.
+#
+# To test manually follow along in the book
+# Squid Proxy Server 3.1 Beginner's Guide Page 34
+#
+# Add this to the top of /etc/squid/squid.conf:
+# cache_dir ufs /var/squid/cache/ 500 16 256
+# acl my_machine src 192.0.2.21 # Replace with your desktop's IP address
+# http_access allow my_machine
+#
+# Make sure apache is running.
+# # svcs apache22
+# Start squid:
+# # svcadm enable squid
+# On your desktop set your web browser to proxy through this squid:
+# Edit -> Preferences -> Advanced -> Network -> Settings
+# Check: Manual proxy configuration
+# HTTP Proxy: <squid servers IP address> Port: 3128
+# Save
+# Enter <squid server URL> in your web browser. You should be accessing squid
+# and seeing files stored in the http server on that machine.
+# Enter <squid server URL>:897 in your web browser and squid should complain.
+# Squid is working properly.
+
test: $(NO_TESTS)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
diff --git a/components/squid/http-squid b/components/squid/files/http-squid
similarity index 100%
rename from components/squid/http-squid
rename to components/squid/files/http-squid
diff --git a/components/squid/http-squid.xml b/components/squid/files/http-squid.xml
similarity index 100%
rename from components/squid/http-squid.xml
rename to components/squid/files/http-squid.xml
diff --git a/components/squid/squid.conf.default b/components/squid/files/squid.conf.default
similarity index 100%
rename from components/squid/squid.conf.default
rename to components/squid/files/squid.conf.default
diff --git a/components/squid/squid.p5m b/components/squid/squid.p5m
index 720d4a3..d1c2d32 100644
--- a/components/squid/squid.p5m
+++ b/components/squid/squid.p5m
@@ -29,34 +29,42 @@
value="Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more."
set name=pkg.summary value="Squid Web Proxy Cache"
set name=com.oracle.info.description value="the Squid Web Proxy Cache"
-set name=com.oracle.info.tpno value=9044
+set name=com.oracle.info.tpno value=13323
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=LSARC/2009/130
+set name=org.opensolaris.arc-caseid value=LSARC/2009/130
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license squid.license license=GPLv2
+
+# smf stuff to control start/stop of squid
+file files/http-squid path=lib/svc/method/http-squid \
+ restart_fmri=svc:/network/http:squid
+file files/http-squid.xml path=lib/svc/manifest/network/http-squid.xml
+
+# special attributes
+file path=etc/squid/cachemgr.conf group=webservd mode=0644 \
+ original_name=SUNWsquid:etc/squid/cachemgr.conf preserve=renamenew
+file path=etc/squid/mime.conf group=webservd mode=0644 \
+ original_name=SUNWsquid:etc/squid/mime.conf preserve=renamenew
+file path=etc/squid/msntauth.conf group=webservd mode=0644 \
+ original_name=SUNWsquid:etc/squid/msntauth.conf preserve=renamenew
+file path=etc/squid/squid.conf group=webservd mode=0644 \
+ original_name=SUNWsquid:etc/squid/squid.conf preserve=renamenew
dir path=var/squid/cache group=webservd owner=webservd mode=0755
dir path=var/squid/logs group=webservd owner=webservd mode=0755
dir path=var/squid/run group=webservd owner=webservd mode=0755
-file path=etc/squid/cachemgr.conf group=webservd mode=0644 \
- original_name=SUNWsquid:etc/squid/cachemgr.conf preserve=renamenew
+
+# from here on files have no modified attributes
file path=etc/squid/cachemgr.conf.default
file path=etc/squid/errorpage.css
file path=etc/squid/errorpage.css.default
-file path=etc/squid/mime.conf group=webservd mode=0644 \
- original_name=SUNWsquid:etc/squid/mime.conf preserve=renamenew
file path=etc/squid/mime.conf.default
-file path=etc/squid/msntauth.conf group=webservd mode=0644 \
- original_name=SUNWsquid:etc/squid/msntauth.conf preserve=renamenew
file path=etc/squid/msntauth.conf.default
-file path=etc/squid/squid.conf group=webservd mode=0644 \
- original_name=SUNWsquid:etc/squid/squid.conf preserve=renamenew
file path=etc/squid/squid.conf.default
file path=etc/squid/squid.conf.documented
-file http-squid.xml path=lib/svc/manifest/network/http-squid.xml
-file http-squid path=lib/svc/method/http-squid
file path=usr/squid/bin/squidclient
file path=usr/squid/libexec/cachemgr.cgi
file path=usr/squid/libexec/digest_ldap_auth
@@ -100,6 +108,9 @@
file path=usr/squid/share/errors/COPYRIGHT
file path=usr/squid/share/errors/TRANSLATORS
file path=usr/squid/share/errors/af/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/af/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/af/ERR_AGENT_WPAD
file path=usr/squid/share/errors/af/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/af/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/af/ERR_CANNOT_FORWARD
@@ -136,7 +147,27 @@
file path=usr/squid/share/errors/af/ERR_URN_RESOLVE
file path=usr/squid/share/errors/af/ERR_WRITE_ERROR
file path=usr/squid/share/errors/af/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/af/error-details.txt
+link path=usr/squid/share/errors/ar-ae target=ar
+link path=usr/squid/share/errors/ar-bh target=ar
+link path=usr/squid/share/errors/ar-dz target=ar
+link path=usr/squid/share/errors/ar-eg target=ar
+link path=usr/squid/share/errors/ar-iq target=ar
+link path=usr/squid/share/errors/ar-jo target=ar
+link path=usr/squid/share/errors/ar-kw target=ar
+link path=usr/squid/share/errors/ar-lb target=ar
+link path=usr/squid/share/errors/ar-ly target=ar
+link path=usr/squid/share/errors/ar-ma target=ar
+link path=usr/squid/share/errors/ar-om target=ar
+link path=usr/squid/share/errors/ar-qa target=ar
+link path=usr/squid/share/errors/ar-sa target=ar
+link path=usr/squid/share/errors/ar-sy target=ar
+link path=usr/squid/share/errors/ar-tn target=ar
+link path=usr/squid/share/errors/ar-ye target=ar
file path=usr/squid/share/errors/ar/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/ar/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/ar/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/ar/ERR_AGENT_WPAD
file path=usr/squid/share/errors/ar/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/ar/ERR_CANNOT_FORWARD
@@ -173,7 +204,12 @@
file path=usr/squid/share/errors/ar/ERR_URN_RESOLVE
file path=usr/squid/share/errors/ar/ERR_WRITE_ERROR
file path=usr/squid/share/errors/ar/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/ar/error-details.txt
+link path=usr/squid/share/errors/az-az target=az
file path=usr/squid/share/errors/az/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/az/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/az/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/az/ERR_AGENT_WPAD
file path=usr/squid/share/errors/az/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/az/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/az/ERR_CANNOT_FORWARD
@@ -210,7 +246,12 @@
file path=usr/squid/share/errors/az/ERR_URN_RESOLVE
file path=usr/squid/share/errors/az/ERR_WRITE_ERROR
file path=usr/squid/share/errors/az/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/az/error-details.txt
+link path=usr/squid/share/errors/bg-bg target=bg
file path=usr/squid/share/errors/bg/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/bg/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/bg/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/bg/ERR_AGENT_WPAD
file path=usr/squid/share/errors/bg/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/bg/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/bg/ERR_CANNOT_FORWARD
@@ -247,7 +288,11 @@
file path=usr/squid/share/errors/bg/ERR_URN_RESOLVE
file path=usr/squid/share/errors/bg/ERR_WRITE_ERROR
file path=usr/squid/share/errors/bg/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/bg/error-details.txt
file path=usr/squid/share/errors/ca/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/ca/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/ca/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/ca/ERR_AGENT_WPAD
file path=usr/squid/share/errors/ca/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/ca/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/ca/ERR_CANNOT_FORWARD
@@ -284,7 +329,12 @@
file path=usr/squid/share/errors/ca/ERR_URN_RESOLVE
file path=usr/squid/share/errors/ca/ERR_WRITE_ERROR
file path=usr/squid/share/errors/ca/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/ca/error-details.txt
+link path=usr/squid/share/errors/cs-cz target=cs
file path=usr/squid/share/errors/cs/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/cs/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/cs/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/cs/ERR_AGENT_WPAD
file path=usr/squid/share/errors/cs/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/cs/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/cs/ERR_CANNOT_FORWARD
@@ -321,7 +371,12 @@
file path=usr/squid/share/errors/cs/ERR_URN_RESOLVE
file path=usr/squid/share/errors/cs/ERR_WRITE_ERROR
file path=usr/squid/share/errors/cs/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/cs/error-details.txt
+link path=usr/squid/share/errors/da-dk target=da
file path=usr/squid/share/errors/da/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/da/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/da/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/da/ERR_AGENT_WPAD
file path=usr/squid/share/errors/da/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/da/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/da/ERR_CANNOT_FORWARD
@@ -358,7 +413,16 @@
file path=usr/squid/share/errors/da/ERR_URN_RESOLVE
file path=usr/squid/share/errors/da/ERR_WRITE_ERROR
file path=usr/squid/share/errors/da/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/da/error-details.txt
+link path=usr/squid/share/errors/de-at target=de
+link path=usr/squid/share/errors/de-ch target=de
+link path=usr/squid/share/errors/de-de target=de
+link path=usr/squid/share/errors/de-li target=de
+link path=usr/squid/share/errors/de-lu target=de
file path=usr/squid/share/errors/de/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/de/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/de/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/de/ERR_AGENT_WPAD
file path=usr/squid/share/errors/de/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/de/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/de/ERR_CANNOT_FORWARD
@@ -395,7 +459,12 @@
file path=usr/squid/share/errors/de/ERR_URN_RESOLVE
file path=usr/squid/share/errors/de/ERR_WRITE_ERROR
file path=usr/squid/share/errors/de/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/de/error-details.txt
+link path=usr/squid/share/errors/el-gr target=el
file path=usr/squid/share/errors/el/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/el/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/el/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/el/ERR_AGENT_WPAD
file path=usr/squid/share/errors/el/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/el/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/el/ERR_CANNOT_FORWARD
@@ -432,7 +501,26 @@
file path=usr/squid/share/errors/el/ERR_URN_RESOLVE
file path=usr/squid/share/errors/el/ERR_WRITE_ERROR
file path=usr/squid/share/errors/el/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/el/error-details.txt
+link path=usr/squid/share/errors/en-au target=en
+link path=usr/squid/share/errors/en-bz target=en
+link path=usr/squid/share/errors/en-ca target=en
+link path=usr/squid/share/errors/en-gb target=en
+link path=usr/squid/share/errors/en-ie target=en
+link path=usr/squid/share/errors/en-in target=en
+link path=usr/squid/share/errors/en-jm target=en
+link path=usr/squid/share/errors/en-nz target=en
+link path=usr/squid/share/errors/en-ph target=en
+link path=usr/squid/share/errors/en-sg target=en
+link path=usr/squid/share/errors/en-tt target=en
+link path=usr/squid/share/errors/en-uk target=en
+link path=usr/squid/share/errors/en-us target=en
+link path=usr/squid/share/errors/en-za target=en
+link path=usr/squid/share/errors/en-zw target=en
file path=usr/squid/share/errors/en/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/en/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/en/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/en/ERR_AGENT_WPAD
file path=usr/squid/share/errors/en/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/en/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/en/ERR_CANNOT_FORWARD
@@ -469,7 +557,30 @@
file path=usr/squid/share/errors/en/ERR_URN_RESOLVE
file path=usr/squid/share/errors/en/ERR_WRITE_ERROR
file path=usr/squid/share/errors/en/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/en/error-details.txt
+link path=usr/squid/share/errors/es-ar target=es
+link path=usr/squid/share/errors/es-bo target=es
+link path=usr/squid/share/errors/es-cl target=es
+link path=usr/squid/share/errors/es-co target=es
+link path=usr/squid/share/errors/es-cr target=es
+link path=usr/squid/share/errors/es-do target=es
+link path=usr/squid/share/errors/es-ec target=es
+link path=usr/squid/share/errors/es-es target=es
+link path=usr/squid/share/errors/es-gt target=es
+link path=usr/squid/share/errors/es-hn target=es
+link path=usr/squid/share/errors/es-mx target=es
+link path=usr/squid/share/errors/es-ni target=es
+link path=usr/squid/share/errors/es-pa target=es
+link path=usr/squid/share/errors/es-pe target=es
+link path=usr/squid/share/errors/es-pr target=es
+link path=usr/squid/share/errors/es-py target=es
+link path=usr/squid/share/errors/es-sv target=es
+link path=usr/squid/share/errors/es-uy target=es
+link path=usr/squid/share/errors/es-ve target=es
file path=usr/squid/share/errors/es/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/es/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/es/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/es/ERR_AGENT_WPAD
file path=usr/squid/share/errors/es/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/es/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/es/ERR_CANNOT_FORWARD
@@ -506,7 +617,12 @@
file path=usr/squid/share/errors/es/ERR_URN_RESOLVE
file path=usr/squid/share/errors/es/ERR_WRITE_ERROR
file path=usr/squid/share/errors/es/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/es/error-details.txt
+link path=usr/squid/share/errors/et-ee target=et
file path=usr/squid/share/errors/et/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/et/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/et/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/et/ERR_AGENT_WPAD
file path=usr/squid/share/errors/et/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/et/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/et/ERR_CANNOT_FORWARD
@@ -543,7 +659,13 @@
file path=usr/squid/share/errors/et/ERR_URN_RESOLVE
file path=usr/squid/share/errors/et/ERR_WRITE_ERROR
file path=usr/squid/share/errors/et/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/et/error-details.txt
+link path=usr/squid/share/errors/fa-fa target=fa
+link path=usr/squid/share/errors/fa-ir target=fa
file path=usr/squid/share/errors/fa/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/fa/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/fa/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/fa/ERR_AGENT_WPAD
file path=usr/squid/share/errors/fa/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/fa/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/fa/ERR_CANNOT_FORWARD
@@ -580,7 +702,12 @@
file path=usr/squid/share/errors/fa/ERR_URN_RESOLVE
file path=usr/squid/share/errors/fa/ERR_WRITE_ERROR
file path=usr/squid/share/errors/fa/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/fa/error-details.txt
+link path=usr/squid/share/errors/fi-fi target=fi
file path=usr/squid/share/errors/fi/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/fi/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/fi/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/fi/ERR_AGENT_WPAD
file path=usr/squid/share/errors/fi/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/fi/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/fi/ERR_CANNOT_FORWARD
@@ -617,7 +744,17 @@
file path=usr/squid/share/errors/fi/ERR_URN_RESOLVE
file path=usr/squid/share/errors/fi/ERR_WRITE_ERROR
file path=usr/squid/share/errors/fi/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/fi/error-details.txt
+link path=usr/squid/share/errors/fr-be target=fr
+link path=usr/squid/share/errors/fr-ca target=fr
+link path=usr/squid/share/errors/fr-ch target=fr
+link path=usr/squid/share/errors/fr-fr target=fr
+link path=usr/squid/share/errors/fr-lu target=fr
+link path=usr/squid/share/errors/fr-mc target=fr
file path=usr/squid/share/errors/fr/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/fr/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/fr/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/fr/ERR_AGENT_WPAD
file path=usr/squid/share/errors/fr/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/fr/ERR_CANNOT_FORWARD
@@ -654,7 +791,12 @@
file path=usr/squid/share/errors/fr/ERR_URN_RESOLVE
file path=usr/squid/share/errors/fr/ERR_WRITE_ERROR
file path=usr/squid/share/errors/fr/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/fr/error-details.txt
+link path=usr/squid/share/errors/he-il target=he
file path=usr/squid/share/errors/he/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/he/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/he/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/he/ERR_AGENT_WPAD
file path=usr/squid/share/errors/he/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/he/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/he/ERR_CANNOT_FORWARD
@@ -691,7 +833,12 @@
file path=usr/squid/share/errors/he/ERR_URN_RESOLVE
file path=usr/squid/share/errors/he/ERR_WRITE_ERROR
file path=usr/squid/share/errors/he/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/he/error-details.txt
+link path=usr/squid/share/errors/hu-hu target=hu
file path=usr/squid/share/errors/hu/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/hu/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/hu/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/hu/ERR_AGENT_WPAD
file path=usr/squid/share/errors/hu/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/hu/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/hu/ERR_CANNOT_FORWARD
@@ -728,7 +875,13 @@
file path=usr/squid/share/errors/hu/ERR_URN_RESOLVE
file path=usr/squid/share/errors/hu/ERR_WRITE_ERROR
file path=usr/squid/share/errors/hu/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/hu/error-details.txt
+link path=usr/squid/share/errors/hy-am target=hy
+link path=usr/squid/share/errors/hy-armn target=hy
file path=usr/squid/share/errors/hy/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/hy/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/hy/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/hy/ERR_AGENT_WPAD
file path=usr/squid/share/errors/hy/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/hy/ERR_CANNOT_FORWARD
@@ -765,7 +918,12 @@
file path=usr/squid/share/errors/hy/ERR_URN_RESOLVE
file path=usr/squid/share/errors/hy/ERR_WRITE_ERROR
file path=usr/squid/share/errors/hy/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/hy/error-details.txt
+link path=usr/squid/share/errors/id-id target=id
file path=usr/squid/share/errors/id/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/id/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/id/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/id/ERR_AGENT_WPAD
file path=usr/squid/share/errors/id/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/id/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/id/ERR_CANNOT_FORWARD
@@ -802,7 +960,13 @@
file path=usr/squid/share/errors/id/ERR_URN_RESOLVE
file path=usr/squid/share/errors/id/ERR_WRITE_ERROR
file path=usr/squid/share/errors/id/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/id/error-details.txt
+link path=usr/squid/share/errors/it-ch target=it
+link path=usr/squid/share/errors/it-it target=it
file path=usr/squid/share/errors/it/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/it/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/it/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/it/ERR_AGENT_WPAD
file path=usr/squid/share/errors/it/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/it/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/it/ERR_CANNOT_FORWARD
@@ -839,7 +1003,12 @@
file path=usr/squid/share/errors/it/ERR_URN_RESOLVE
file path=usr/squid/share/errors/it/ERR_WRITE_ERROR
file path=usr/squid/share/errors/it/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/it/error-details.txt
+link path=usr/squid/share/errors/ja-jp target=ja
file path=usr/squid/share/errors/ja/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/ja/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/ja/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/ja/ERR_AGENT_WPAD
file path=usr/squid/share/errors/ja/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/ja/ERR_CANNOT_FORWARD
@@ -876,7 +1045,13 @@
file path=usr/squid/share/errors/ja/ERR_URN_RESOLVE
file path=usr/squid/share/errors/ja/ERR_WRITE_ERROR
file path=usr/squid/share/errors/ja/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/ja/error-details.txt
+link path=usr/squid/share/errors/ko-kp target=ko
+link path=usr/squid/share/errors/ko-kr target=ko
file path=usr/squid/share/errors/ko/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/ko/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/ko/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/ko/ERR_AGENT_WPAD
file path=usr/squid/share/errors/ko/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/ko/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/ko/ERR_CANNOT_FORWARD
@@ -913,7 +1088,12 @@
file path=usr/squid/share/errors/ko/ERR_URN_RESOLVE
file path=usr/squid/share/errors/ko/ERR_WRITE_ERROR
file path=usr/squid/share/errors/ko/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/ko/error-details.txt
+link path=usr/squid/share/errors/lt-lt target=lt
file path=usr/squid/share/errors/lt/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/lt/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/lt/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/lt/ERR_AGENT_WPAD
file path=usr/squid/share/errors/lt/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/lt/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/lt/ERR_CANNOT_FORWARD
@@ -950,7 +1130,12 @@
file path=usr/squid/share/errors/lt/ERR_URN_RESOLVE
file path=usr/squid/share/errors/lt/ERR_WRITE_ERROR
file path=usr/squid/share/errors/lt/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/lt/error-details.txt
+link path=usr/squid/share/errors/lv-lv target=lv
file path=usr/squid/share/errors/lv/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/lv/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/lv/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/lv/ERR_AGENT_WPAD
file path=usr/squid/share/errors/lv/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/lv/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/lv/ERR_CANNOT_FORWARD
@@ -987,7 +1172,12 @@
file path=usr/squid/share/errors/lv/ERR_URN_RESOLVE
file path=usr/squid/share/errors/lv/ERR_WRITE_ERROR
file path=usr/squid/share/errors/lv/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/lv/error-details.txt
+link path=usr/squid/share/errors/ms-my target=ms
file path=usr/squid/share/errors/ms/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/ms/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/ms/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/ms/ERR_AGENT_WPAD
file path=usr/squid/share/errors/ms/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/ms/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/ms/ERR_CANNOT_FORWARD
@@ -1024,7 +1214,12 @@
file path=usr/squid/share/errors/ms/ERR_URN_RESOLVE
file path=usr/squid/share/errors/ms/ERR_WRITE_ERROR
file path=usr/squid/share/errors/ms/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/ms/error-details.txt
+link path=usr/squid/share/errors/nl-nl target=nl
file path=usr/squid/share/errors/nl/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/nl/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/nl/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/nl/ERR_AGENT_WPAD
file path=usr/squid/share/errors/nl/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/nl/ERR_CANNOT_FORWARD
@@ -1061,7 +1256,11 @@
file path=usr/squid/share/errors/nl/ERR_URN_RESOLVE
file path=usr/squid/share/errors/nl/ERR_WRITE_ERROR
file path=usr/squid/share/errors/nl/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/nl/error-details.txt
file path=usr/squid/share/errors/oc/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/oc/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/oc/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/oc/ERR_AGENT_WPAD
file path=usr/squid/share/errors/oc/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/oc/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/oc/ERR_CANNOT_FORWARD
@@ -1098,7 +1297,12 @@
file path=usr/squid/share/errors/oc/ERR_URN_RESOLVE
file path=usr/squid/share/errors/oc/ERR_WRITE_ERROR
file path=usr/squid/share/errors/oc/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/oc/error-details.txt
+link path=usr/squid/share/errors/pl-pl target=pl
file path=usr/squid/share/errors/pl/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/pl/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/pl/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/pl/ERR_AGENT_WPAD
file path=usr/squid/share/errors/pl/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/pl/ERR_CANNOT_FORWARD
@@ -1135,7 +1339,11 @@
file path=usr/squid/share/errors/pl/ERR_URN_RESOLVE
file path=usr/squid/share/errors/pl/ERR_WRITE_ERROR
file path=usr/squid/share/errors/pl/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/pl/error-details.txt
file path=usr/squid/share/errors/pt-br/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/pt-br/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/pt-br/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/pt-br/ERR_AGENT_WPAD
file path=usr/squid/share/errors/pt-br/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/pt-br/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/pt-br/ERR_CANNOT_FORWARD
@@ -1172,7 +1380,12 @@
file path=usr/squid/share/errors/pt-br/ERR_URN_RESOLVE
file path=usr/squid/share/errors/pt-br/ERR_WRITE_ERROR
file path=usr/squid/share/errors/pt-br/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/pt-br/error-details.txt
+link path=usr/squid/share/errors/pt-pt target=pt
file path=usr/squid/share/errors/pt/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/pt/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/pt/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/pt/ERR_AGENT_WPAD
file path=usr/squid/share/errors/pt/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/pt/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/pt/ERR_CANNOT_FORWARD
@@ -1209,7 +1422,13 @@
file path=usr/squid/share/errors/pt/ERR_URN_RESOLVE
file path=usr/squid/share/errors/pt/ERR_WRITE_ERROR
file path=usr/squid/share/errors/pt/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/pt/error-details.txt
+link path=usr/squid/share/errors/ro-md target=ro
+link path=usr/squid/share/errors/ro-ro target=ro
file path=usr/squid/share/errors/ro/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/ro/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/ro/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/ro/ERR_AGENT_WPAD
file path=usr/squid/share/errors/ro/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/ro/ERR_CANNOT_FORWARD
@@ -1246,7 +1465,12 @@
file path=usr/squid/share/errors/ro/ERR_URN_RESOLVE
file path=usr/squid/share/errors/ro/ERR_WRITE_ERROR
file path=usr/squid/share/errors/ro/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/ro/error-details.txt
+link path=usr/squid/share/errors/ru-ru target=ru
file path=usr/squid/share/errors/ru/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/ru/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/ru/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/ru/ERR_AGENT_WPAD
file path=usr/squid/share/errors/ru/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/ru/ERR_CANNOT_FORWARD
@@ -1283,7 +1507,12 @@
file path=usr/squid/share/errors/ru/ERR_URN_RESOLVE
file path=usr/squid/share/errors/ru/ERR_WRITE_ERROR
file path=usr/squid/share/errors/ru/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/ru/error-details.txt
+link path=usr/squid/share/errors/sk-sk target=sk
file path=usr/squid/share/errors/sk/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/sk/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/sk/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/sk/ERR_AGENT_WPAD
file path=usr/squid/share/errors/sk/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/sk/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/sk/ERR_CANNOT_FORWARD
@@ -1320,7 +1549,54 @@
file path=usr/squid/share/errors/sk/ERR_URN_RESOLVE
file path=usr/squid/share/errors/sk/ERR_WRITE_ERROR
file path=usr/squid/share/errors/sk/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/sk/error-details.txt
+link path=usr/squid/share/errors/sl-si target=sl
+file path=usr/squid/share/errors/sl/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/sl/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/sl/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/sl/ERR_AGENT_WPAD
+file path=usr/squid/share/errors/sl/ERR_CACHE_ACCESS_DENIED
+file path=usr/squid/share/errors/sl/ERR_CACHE_MGR_ACCESS_DENIED
+file path=usr/squid/share/errors/sl/ERR_CANNOT_FORWARD
+file path=usr/squid/share/errors/sl/ERR_CONNECT_FAIL
+file path=usr/squid/share/errors/sl/ERR_DIR_LISTING
+file path=usr/squid/share/errors/sl/ERR_DNS_FAIL
+file path=usr/squid/share/errors/sl/ERR_ESI
+file path=usr/squid/share/errors/sl/ERR_FORWARDING_DENIED
+file path=usr/squid/share/errors/sl/ERR_FTP_DISABLED
+file path=usr/squid/share/errors/sl/ERR_FTP_FAILURE
+file path=usr/squid/share/errors/sl/ERR_FTP_FORBIDDEN
+file path=usr/squid/share/errors/sl/ERR_FTP_NOT_FOUND
+file path=usr/squid/share/errors/sl/ERR_FTP_PUT_CREATED
+file path=usr/squid/share/errors/sl/ERR_FTP_PUT_ERROR
+file path=usr/squid/share/errors/sl/ERR_FTP_PUT_MODIFIED
+file path=usr/squid/share/errors/sl/ERR_FTP_UNAVAILABLE
+file path=usr/squid/share/errors/sl/ERR_GATEWAY_FAILURE
+file path=usr/squid/share/errors/sl/ERR_ICAP_FAILURE
+file path=usr/squid/share/errors/sl/ERR_INVALID_REQ
+file path=usr/squid/share/errors/sl/ERR_INVALID_RESP
+file path=usr/squid/share/errors/sl/ERR_INVALID_URL
+file path=usr/squid/share/errors/sl/ERR_LIFETIME_EXP
+file path=usr/squid/share/errors/sl/ERR_NO_RELAY
+file path=usr/squid/share/errors/sl/ERR_ONLY_IF_CACHED_MISS
+file path=usr/squid/share/errors/sl/ERR_PRECONDITION_FAILED
+file path=usr/squid/share/errors/sl/ERR_READ_ERROR
+file path=usr/squid/share/errors/sl/ERR_READ_TIMEOUT
+file path=usr/squid/share/errors/sl/ERR_SECURE_CONNECT_FAIL
+file path=usr/squid/share/errors/sl/ERR_SHUTTING_DOWN
+file path=usr/squid/share/errors/sl/ERR_SOCKET_FAILURE
+file path=usr/squid/share/errors/sl/ERR_TOO_BIG
+file path=usr/squid/share/errors/sl/ERR_UNSUP_HTTPVERSION
+file path=usr/squid/share/errors/sl/ERR_UNSUP_REQ
+file path=usr/squid/share/errors/sl/ERR_URN_RESOLVE
+file path=usr/squid/share/errors/sl/ERR_WRITE_ERROR
+file path=usr/squid/share/errors/sl/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/sl/error-details.txt
+link path=usr/squid/share/errors/sr target=sr-latn
file path=usr/squid/share/errors/sr-cyrl/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/sr-cyrl/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/sr-cyrl/ERR_AGENT_WPAD
file path=usr/squid/share/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/sr-cyrl/ERR_CANNOT_FORWARD
@@ -1357,7 +1633,12 @@
file path=usr/squid/share/errors/sr-cyrl/ERR_URN_RESOLVE
file path=usr/squid/share/errors/sr-cyrl/ERR_WRITE_ERROR
file path=usr/squid/share/errors/sr-cyrl/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/sr-cyrl/error-details.txt
+link path=usr/squid/share/errors/sr-latn-cs target=sr-latn
file path=usr/squid/share/errors/sr-latn/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/sr-latn/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/sr-latn/ERR_AGENT_WPAD
file path=usr/squid/share/errors/sr-latn/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/sr-latn/ERR_CANNOT_FORWARD
@@ -1394,7 +1675,14 @@
file path=usr/squid/share/errors/sr-latn/ERR_URN_RESOLVE
file path=usr/squid/share/errors/sr-latn/ERR_WRITE_ERROR
file path=usr/squid/share/errors/sr-latn/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/sr-latn/error-details.txt
+link path=usr/squid/share/errors/sr-sp target=sr-latn
+link path=usr/squid/share/errors/sv-fi target=sv
+link path=usr/squid/share/errors/sv-se target=sv
file path=usr/squid/share/errors/sv/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/sv/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/sv/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/sv/ERR_AGENT_WPAD
file path=usr/squid/share/errors/sv/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/sv/ERR_CANNOT_FORWARD
@@ -1431,7 +1719,11 @@
file path=usr/squid/share/errors/sv/ERR_URN_RESOLVE
file path=usr/squid/share/errors/sv/ERR_WRITE_ERROR
file path=usr/squid/share/errors/sv/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/sv/error-details.txt
file path=usr/squid/share/errors/templates/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/templates/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/templates/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/templates/ERR_AGENT_WPAD
file path=usr/squid/share/errors/templates/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/templates/ERR_CANNOT_FORWARD
@@ -1468,7 +1760,12 @@
file path=usr/squid/share/errors/templates/ERR_URN_RESOLVE
file path=usr/squid/share/errors/templates/ERR_WRITE_ERROR
file path=usr/squid/share/errors/templates/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/templates/error-details.txt
+link path=usr/squid/share/errors/th-th target=th
file path=usr/squid/share/errors/th/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/th/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/th/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/th/ERR_AGENT_WPAD
file path=usr/squid/share/errors/th/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/th/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/th/ERR_CANNOT_FORWARD
@@ -1505,7 +1802,12 @@
file path=usr/squid/share/errors/th/ERR_URN_RESOLVE
file path=usr/squid/share/errors/th/ERR_WRITE_ERROR
file path=usr/squid/share/errors/th/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/th/error-details.txt
+link path=usr/squid/share/errors/tr-tr target=tr
file path=usr/squid/share/errors/tr/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/tr/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/tr/ERR_AGENT_WPAD
file path=usr/squid/share/errors/tr/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/tr/ERR_CANNOT_FORWARD
@@ -1542,7 +1844,12 @@
file path=usr/squid/share/errors/tr/ERR_URN_RESOLVE
file path=usr/squid/share/errors/tr/ERR_WRITE_ERROR
file path=usr/squid/share/errors/tr/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/tr/error-details.txt
+link path=usr/squid/share/errors/uk-ua target=uk
file path=usr/squid/share/errors/uk/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/uk/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/uk/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/uk/ERR_AGENT_WPAD
file path=usr/squid/share/errors/uk/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/uk/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/uk/ERR_CANNOT_FORWARD
@@ -1579,7 +1886,11 @@
file path=usr/squid/share/errors/uk/ERR_URN_RESOLVE
file path=usr/squid/share/errors/uk/ERR_WRITE_ERROR
file path=usr/squid/share/errors/uk/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/uk/error-details.txt
file path=usr/squid/share/errors/uz/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/uz/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/uz/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/uz/ERR_AGENT_WPAD
file path=usr/squid/share/errors/uz/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/uz/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/uz/ERR_CANNOT_FORWARD
@@ -1616,7 +1927,12 @@
file path=usr/squid/share/errors/uz/ERR_URN_RESOLVE
file path=usr/squid/share/errors/uz/ERR_WRITE_ERROR
file path=usr/squid/share/errors/uz/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/uz/error-details.txt
+link path=usr/squid/share/errors/vi-vn target=vi
file path=usr/squid/share/errors/vi/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/vi/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/vi/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/vi/ERR_AGENT_WPAD
file path=usr/squid/share/errors/vi/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/vi/ERR_CANNOT_FORWARD
@@ -1653,7 +1969,11 @@
file path=usr/squid/share/errors/vi/ERR_URN_RESOLVE
file path=usr/squid/share/errors/vi/ERR_WRITE_ERROR
file path=usr/squid/share/errors/vi/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/vi/error-details.txt
file path=usr/squid/share/errors/zh-cn/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/zh-cn/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/zh-cn/ERR_AGENT_WPAD
file path=usr/squid/share/errors/zh-cn/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/zh-cn/ERR_CANNOT_FORWARD
@@ -1690,7 +2010,14 @@
file path=usr/squid/share/errors/zh-cn/ERR_URN_RESOLVE
file path=usr/squid/share/errors/zh-cn/ERR_WRITE_ERROR
file path=usr/squid/share/errors/zh-cn/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/zh-cn/error-details.txt
+link path=usr/squid/share/errors/zh-hk target=zh-tw
+link path=usr/squid/share/errors/zh-mo target=zh-tw
+link path=usr/squid/share/errors/zh-sg target=zh-cn
file path=usr/squid/share/errors/zh-tw/ERR_ACCESS_DENIED
+file path=usr/squid/share/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED
+file path=usr/squid/share/errors/zh-tw/ERR_AGENT_CONFIGURE
+file path=usr/squid/share/errors/zh-tw/ERR_AGENT_WPAD
file path=usr/squid/share/errors/zh-tw/ERR_CACHE_ACCESS_DENIED
file path=usr/squid/share/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED
file path=usr/squid/share/errors/zh-tw/ERR_CANNOT_FORWARD
@@ -1727,6 +2054,7 @@
file path=usr/squid/share/errors/zh-tw/ERR_URN_RESOLVE
file path=usr/squid/share/errors/zh-tw/ERR_WRITE_ERROR
file path=usr/squid/share/errors/zh-tw/ERR_ZERO_SIZE_OBJECT
+file path=usr/squid/share/errors/zh-tw/error-details.txt
file path=usr/squid/share/icons/anthony-binhex.gif
file path=usr/squid/share/icons/anthony-bomb.gif
file path=usr/squid/share/icons/anthony-box.gif
@@ -1755,106 +2083,3 @@
file path=usr/squid/share/icons/anthony-xbm.gif
file path=usr/squid/share/icons/anthony-xpm.gif
file path=usr/squid/share/mib.txt
-license squid.license license=GPLv2
-link path=usr/squid/share/errors/ar-ae target=ar
-link path=usr/squid/share/errors/ar-bh target=ar
-link path=usr/squid/share/errors/ar-dz target=ar
-link path=usr/squid/share/errors/ar-eg target=ar
-link path=usr/squid/share/errors/ar-iq target=ar
-link path=usr/squid/share/errors/ar-jo target=ar
-link path=usr/squid/share/errors/ar-kw target=ar
-link path=usr/squid/share/errors/ar-lb target=ar
-link path=usr/squid/share/errors/ar-ly target=ar
-link path=usr/squid/share/errors/ar-ma target=ar
-link path=usr/squid/share/errors/ar-om target=ar
-link path=usr/squid/share/errors/ar-qa target=ar
-link path=usr/squid/share/errors/ar-sa target=ar
-link path=usr/squid/share/errors/ar-sy target=ar
-link path=usr/squid/share/errors/ar-tn target=ar
-link path=usr/squid/share/errors/ar-ye target=ar
-link path=usr/squid/share/errors/az-az target=az
-link path=usr/squid/share/errors/bg-bg target=bg
-link path=usr/squid/share/errors/cs-cz target=cs
-link path=usr/squid/share/errors/da-dk target=da
-link path=usr/squid/share/errors/de-at target=de
-link path=usr/squid/share/errors/de-ch target=de
-link path=usr/squid/share/errors/de-de target=de
-link path=usr/squid/share/errors/de-li target=de
-link path=usr/squid/share/errors/de-lu target=de
-link path=usr/squid/share/errors/el-gr target=el
-link path=usr/squid/share/errors/en-au target=en
-link path=usr/squid/share/errors/en-bz target=en
-link path=usr/squid/share/errors/en-ca target=en
-link path=usr/squid/share/errors/en-gb target=en
-link path=usr/squid/share/errors/en-ie target=en
-link path=usr/squid/share/errors/en-in target=en
-link path=usr/squid/share/errors/en-jm target=en
-link path=usr/squid/share/errors/en-nz target=en
-link path=usr/squid/share/errors/en-ph target=en
-link path=usr/squid/share/errors/en-sg target=en
-link path=usr/squid/share/errors/en-tt target=en
-link path=usr/squid/share/errors/en-uk target=en
-link path=usr/squid/share/errors/en-us target=en
-link path=usr/squid/share/errors/en-za target=en
-link path=usr/squid/share/errors/en-zw target=en
-link path=usr/squid/share/errors/es-ar target=es
-link path=usr/squid/share/errors/es-bo target=es
-link path=usr/squid/share/errors/es-cl target=es
-link path=usr/squid/share/errors/es-co target=es
-link path=usr/squid/share/errors/es-cr target=es
-link path=usr/squid/share/errors/es-do target=es
-link path=usr/squid/share/errors/es-ec target=es
-link path=usr/squid/share/errors/es-es target=es
-link path=usr/squid/share/errors/es-gt target=es
-link path=usr/squid/share/errors/es-hn target=es
-link path=usr/squid/share/errors/es-mx target=es
-link path=usr/squid/share/errors/es-ni target=es
-link path=usr/squid/share/errors/es-pa target=es
-link path=usr/squid/share/errors/es-pe target=es
-link path=usr/squid/share/errors/es-pr target=es
-link path=usr/squid/share/errors/es-py target=es
-link path=usr/squid/share/errors/es-sv target=es
-link path=usr/squid/share/errors/es-uy target=es
-link path=usr/squid/share/errors/es-ve target=es
-link path=usr/squid/share/errors/et-ee target=et
-link path=usr/squid/share/errors/fa-fa target=fa
-link path=usr/squid/share/errors/fa-ir target=fa
-link path=usr/squid/share/errors/fi-fi target=fi
-link path=usr/squid/share/errors/fr-be target=fr
-link path=usr/squid/share/errors/fr-ca target=fr
-link path=usr/squid/share/errors/fr-ch target=fr
-link path=usr/squid/share/errors/fr-fr target=fr
-link path=usr/squid/share/errors/fr-lu target=fr
-link path=usr/squid/share/errors/fr-mc target=fr
-link path=usr/squid/share/errors/he-il target=he
-link path=usr/squid/share/errors/hu-hu target=hu
-link path=usr/squid/share/errors/hy-am target=hy
-link path=usr/squid/share/errors/hy-armn target=hy
-link path=usr/squid/share/errors/id-id target=id
-link path=usr/squid/share/errors/it-ch target=it
-link path=usr/squid/share/errors/it-it target=it
-link path=usr/squid/share/errors/ja-jp target=ja
-link path=usr/squid/share/errors/ko-kp target=ko
-link path=usr/squid/share/errors/ko-kr target=ko
-link path=usr/squid/share/errors/lt-lt target=lt
-link path=usr/squid/share/errors/lv-lv target=lv
-link path=usr/squid/share/errors/ms-my target=ms
-link path=usr/squid/share/errors/nl-nl target=nl
-link path=usr/squid/share/errors/pl-pl target=pl
-link path=usr/squid/share/errors/pt-pt target=pt
-link path=usr/squid/share/errors/ro-md target=ro
-link path=usr/squid/share/errors/ro-ro target=ro
-link path=usr/squid/share/errors/ru-ru target=ru
-link path=usr/squid/share/errors/sk-sk target=sk
-link path=usr/squid/share/errors/sr target=sr-latn
-link path=usr/squid/share/errors/sr-latn-cs target=sr-latn
-link path=usr/squid/share/errors/sr-sp target=sr-latn
-link path=usr/squid/share/errors/sv-fi target=sv
-link path=usr/squid/share/errors/sv-se target=sv
-link path=usr/squid/share/errors/th-th target=th
-link path=usr/squid/share/errors/tr-tr target=tr
-link path=usr/squid/share/errors/uk-ua target=uk
-link path=usr/squid/share/errors/vi-vn target=vi
-link path=usr/squid/share/errors/zh-hk target=zh-tw
-link path=usr/squid/share/errors/zh-mo target=zh-tw
-link path=usr/squid/share/errors/zh-sg target=zh-cn
diff --git a/components/visual-panels/usermgr/src/apis/usermgr.xml b/components/visual-panels/usermgr/src/apis/usermgr.xml
index 766964d..e52fdbc 100644
--- a/components/visual-panels/usermgr/src/apis/usermgr.xml
+++ b/components/visual-panels/usermgr/src/apis/usermgr.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
- Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
CDDL HEADER START
@@ -157,6 +157,12 @@
</summary>
<list type="string"/>
</field>
+ <field name="authProfiles" nullable="true">
+ <summary> Specifies the authenticated profiles that have been
+ assigned to the account.
+ </summary>
+ <list type="string"/>
+ </field>
<field name="auths" nullable="true">
<summary> Specifies the authorizations that have been assigned
to the account.
@@ -199,6 +205,7 @@
<field type="boolean" name="homedirChanged"/>
<field type="boolean" name="defShellChanged"/>
<field type="boolean" name="profilesChanged"/>
+ <field type="boolean" name="authProfilesChanged"/>
<field type="boolean" name="rolesChanged"/>
<field type="boolean" name="authsChanged"/>
<field type="boolean" name="limitPrivChanged"/>
@@ -671,7 +678,8 @@
<doc>
Sets the filter options which are used for
all the subsequent operations. The options
- are user or role and search string.
+ are user or role and search string. The
+ default search string is empty string ("").
</doc>
<argument name="usertype" typeref="UserType">
<summary> Specifies if users or roles
diff --git a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AdvancedSettingsDialog.java b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AdvancedSettingsDialog.java
index 831b9e2..cb149d7 100644
--- a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AdvancedSettingsDialog.java
+++ b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AdvancedSettingsDialog.java
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
*/
package com.oracle.solaris.vp.panels.usermgr.client.swing;
@@ -90,6 +90,7 @@
new GroupsSettings(),
new RolesSettings(),
new RightsSettings(),
+ new AuthRightsSettings(),
new AuthsSettings()
};
@@ -97,6 +98,7 @@
private AdvancedSettings roleSettings[] = {
new GroupsSettings(),
new RightsSettings(),
+ new AuthRightsSettings(),
new AuthsSettings()
};
@@ -108,6 +110,7 @@
private String title = Finder.getString("usermgr.advanced.title");
private MutableProperty<String> rightsProperty = new StringProperty();
+ private MutableProperty<String> authRightsProperty = new StringProperty();
private MutableProperty<String> rolesProperty = new StringProperty();
private MutableProperty<String> groupsProperty = new StringProperty();
private MutableProperty<String> authsProperty = new StringProperty();
diff --git a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AuthRightsPanel.java b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AuthRightsPanel.java
new file mode 100644
index 0000000..42e9905
--- /dev/null
+++ b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AuthRightsPanel.java
@@ -0,0 +1,631 @@
+/*
+ * 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 (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ */
+
+package com.oracle.solaris.vp.panels.usermgr.client.swing;
+
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.tree.*;
+import javax.swing.border.*;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.util.*;
+
+import com.oracle.solaris.vp.util.misc.finder.Finder;
+
+/**
+ * SMC code adapted for Visual Panels
+ *
+ * Rights Profiles Panel for Rights Settings
+ */
+public class AuthRightsPanel extends JPanel {
+
+
+ public static Arranger profPanel;
+ private static DblTreeNode srcRoot;
+ private static DblTreeNode dstRoot;
+ private DefaultTreeModel srcModel, dstModel;
+
+ private DblTreeNode [] profNodes;
+ private ProfTreeNode [] profTreeNodes;
+
+ private ProfTreeNode currProfTreeNode;
+ private DblTreeNode currDblTreeNode;
+
+ private String targetRightName;
+ private String targetRight;
+ private JPanel securityPanel;
+
+ private UserManagedObject userObj = null;
+ private UserMgrPanelDescriptor panelDesc = null;
+
+ private Vector vAllRightObjs = null;
+
+ private boolean isProfListOK = true;
+
+ /**
+ * Constructs a panel to contain supplementary rights properties for
+ * the right object.
+ */
+ public AuthRightsPanel(UserMgrPanelDescriptor panelDesc,
+ UserManagedObject userObj) {
+
+ super();
+ this.panelDesc = panelDesc;
+ this.userObj = userObj;
+
+ createGui();
+ loadProfiles();
+ } // constructor
+
+
+ /**
+ * Method for creating GUI
+ */
+ private void createGui() {
+
+ // Set the panel layout
+ GridBagConstraints gbc = new GridBagConstraints();
+ this.setLayout(new GridBagLayout());
+
+ // Excluded and Included rights panel
+ securityPanel = null;
+
+ profPanel = new Arranger("usermgr.advanced.auth_rights.available",
+ "usermgr.advanced.auth_rights.granted");
+
+ Dimension dimension = new Dimension(200, 300);
+ profPanel.srcTree.setCellRenderer(new ProfileRenderer(this));
+ profPanel.srcTree.setVisibleRowCount(10);
+ profPanel.srcTree.setSize(dimension);
+
+ profPanel.dstTree.setCellRenderer(new ProfileRenderer(this));
+ profPanel.dstTree.setVisibleRowCount(10);
+ profPanel.dstTree.setSize(dimension);
+
+ Constraints.constrain(this, profPanel,
+ 0, 0, 1, 1,
+ gbc.BOTH, gbc.CENTER,
+ 1.0, 1.0, 10, 10, 10, 10);
+
+ } // end createGui
+
+
+ /**
+ * Load the Source and Destination trees for rights excluded and
+ * included lists.
+ */
+ private void loadProfiles() {
+
+ // Reset the data models. So old data is discarded
+ profPanel.resetModels();
+
+
+ // Initialize the excluded rights list with all profiles
+ // except for the current one, since a profile can not be
+ // assigned to itself. Note that all profiles are created
+ // as top-level profiles.
+
+ vAllRightObjs = getAvailableProfs();
+
+ srcModel = (DefaultTreeModel) profPanel.srcTree.getModel();
+ srcRoot = (DblTreeNode) srcModel.getRoot();
+
+ dstModel = (DefaultTreeModel) profPanel.dstTree.getModel();
+ dstRoot = (DblTreeNode) dstModel.getRoot();
+
+ profNodes = new DblTreeNode[vAllRightObjs.size()];
+ profTreeNodes = new ProfTreeNode[vAllRightObjs.size()];
+
+ int n = 0;
+ Enumeration e = vAllRightObjs.elements();
+
+ // Build an array of tree nodes that can be used for sorting.
+
+ while (e.hasMoreElements()) {
+ String rightObj = (String)e.nextElement();
+ String rightName = rightObj;
+
+ profTreeNodes[n] = new ProfTreeNode(rightObj);
+
+ n++;
+ }
+
+ // Sort the list of ProfTreeNode objects.
+
+ if (profTreeNodes.length > 1) {
+ NodeCompare comp = new NodeCompare();
+ Sort.sort(profTreeNodes, comp);
+ }
+
+ // With the sorted tree nodes, now we build the src tree.
+ for (int i = 0; i < profTreeNodes.length; i++) {
+ profNodes[i] = new DblTreeNode((Object)profTreeNodes[i]);
+
+ srcModel.insertNodeInto(profNodes[i], srcRoot, i);
+ TreePath nodepath = new TreePath(profNodes[i].getPath());
+ // Make initial display of excluded list
+ profPanel.srcTree.scrollPathToVisible(nodepath);
+ }
+
+
+ // Set TreeModel listeners
+ srcModel.addTreeModelListener(new TreeModelListener() {
+
+ public void treeNodesInserted(TreeModelEvent e) {
+ enableProfileChoices(e);
+ }
+
+ public void treeNodesRemoved(TreeModelEvent e) {
+ disableProfileChoices(e);
+ }
+
+ public void treeNodesChanged(TreeModelEvent e) {}
+
+ public void treeStructureChanged(TreeModelEvent e) {}
+
+ });
+
+ dstModel.addTreeModelListener(new TreeModelListener() {
+
+ public void treeNodesInserted(TreeModelEvent e) {
+ updateDstTree(e);
+ }
+
+ public void treeNodesRemoved(TreeModelEvent e) {
+ updateDstTree(e);
+ }
+
+ public void treeNodesChanged(TreeModelEvent e) {}
+
+ public void treeStructureChanged(TreeModelEvent e) {}
+
+ });
+
+ // Build subprofiles recursively
+ for (int i = 0; i < profNodes.length; i++) {
+ rebuildSubProfiles(profNodes[i], profNodes[i]);
+ }
+
+ String [] subProfList = null;
+
+ // Get the list of profiles that are assigned to current user/role
+ // (in user_attr entry).
+ String rights = userObj.getAuthRights();
+ if (rights != null) {
+ subProfList = userObj.getAuthRights().split(",");
+ }
+
+ profPanel.setInitSelection();
+ if (rights == null || subProfList == null) {
+ return;
+ }
+
+ // Move subprofiles of current profile from excluded list
+ // to included list.
+ // Note that a dimmed profile will stay dimmed after the move.
+ // Therefore, a user can not "unassign" a dimmed profile on the
+ // included list.
+
+
+ for (int j = 0; j < subProfList.length; j++) {
+ boolean foundSubProf = false;
+
+ int count = 0;
+ for (int i = 0; i < profNodes.length; i++) {
+ String profString = profNodes[i].toString();
+
+ if (profString.equals(subProfList[j])) {
+ foundSubProf = true;
+ count = i;
+ break;
+ }
+
+ }
+
+ if (foundSubProf) {
+ profPanel.initLeaf(profPanel.srcTree,
+ profPanel.dstTree, profNodes[count]);
+ }
+ }
+
+ profPanel.setInitSelection();
+
+ } // end loadProfiles
+
+
+ private void updateDstTree(TreeModelEvent e) {
+
+ Vector<DblTreeNode> inclProfsVec = new Vector<DblTreeNode>();
+ Enumeration inclProfsEnum = dstRoot.breadthFirstEnumeration();
+
+ while (inclProfsEnum.hasMoreElements()) {
+ DblTreeNode node = (DblTreeNode)inclProfsEnum.nextElement();
+ inclProfsVec.addElement(node);
+ node.setConflict(false);
+ }
+
+ // Maintain included names as array as optimization
+
+ DblTreeNode [] inclProfs = new DblTreeNode[inclProfsVec.size()];
+ inclProfsVec.copyInto(inclProfs);
+
+ if (inclProfs.length < 2)
+ return;
+
+ for (int i = 0; i < inclProfs.length; i++) {
+ String testString = inclProfs[i].toString();
+
+ for (int j = i + 1; j < inclProfs.length; j++) {
+ if (testString.equals(inclProfs[j].toString())) {
+ inclProfs[j].setConflict(true);
+ inclProfs[i].setConflict(true);
+ TreeNode [] nodes = inclProfs[j].getPath();
+ DblTreeNode parentProf = (DblTreeNode)nodes[1];
+ parentProf.setConflict(true);
+ }
+ }
+ }
+
+ } // end updateDstTree
+
+
+ private void enableProfileChoices(TreeModelEvent e) {
+
+ // Get names of currently included profiles
+ if (e.getPath().length > 1)
+ return;
+
+ Vector<String> inclProfsVec = new Vector<String>();
+ Enumeration inclProfs = dstRoot.depthFirstEnumeration();
+
+ while (inclProfs.hasMoreElements()) {
+ inclProfsVec.addElement(inclProfs.nextElement().toString());
+ }
+
+ // Maintain included names as array as optimization
+
+ String [] inclProfNames = new String[inclProfsVec.size()];
+ inclProfsVec.copyInto(inclProfNames);
+
+ // Look for excluded list items needing updating
+
+ Enumeration topProfs = srcRoot.children();
+ while (topProfs.hasMoreElements()) {
+ DblTreeNode nextTop = (DblTreeNode)topProfs.nextElement();
+ boolean matchFound = false;
+ Enumeration exclProfs = nextTop.depthFirstEnumeration();
+
+ while (exclProfs.hasMoreElements()) {
+ String testString = exclProfs.nextElement().toString();
+ for (int i = 0; i < inclProfNames.length; i++) {
+ if (testString.equals(inclProfNames[i])) {
+ matchFound = true;
+ break;
+ }
+ }
+ if (matchFound)
+ break;
+ }
+
+ // A Profile hierarchy needs to be enabled
+
+ if (!matchFound) {
+ exclProfs = nextTop.depthFirstEnumeration();
+ while (exclProfs.hasMoreElements()) {
+ DblTreeNode onNode =
+ (DblTreeNode) exclProfs.nextElement();
+ onNode.setConflict(false);
+ }
+ nextTop.setConflict(false);
+ }
+ }
+
+ } // end enableProfileChoices
+
+
+ private void disableProfileChoices(TreeModelEvent e) {
+
+ if (e.getPath().length > 1)
+ return;
+
+ Object[] children = e.getChildren();
+ DblTreeNode node = (DblTreeNode)children[0];
+ Enumeration kids = node.breadthFirstEnumeration();
+ while (kids.hasMoreElements()) {
+ disableRecursively((DblTreeNode)kids.nextElement());
+ }
+
+ } // end disableProfileChoices
+
+
+ private void disableRecursively(DblTreeNode node) {
+
+ String testString = node.toString();
+ Enumeration exclProfs = srcRoot.breadthFirstEnumeration();
+ while (exclProfs.hasMoreElements()) {
+ DblTreeNode exclNode = (DblTreeNode)exclProfs.nextElement();
+ if (testString.equals(exclNode.toString())) {
+ TreeNode [] nodes = exclNode.getPath();
+
+ DblTreeNode parentProf = (DblTreeNode)nodes[1];
+ if (!parentProf.isConflict()) {
+ parentProf.setConflict(true);
+ exclNode.setConflict(true);
+ }
+ }
+ }
+
+ } // end disableRecursively
+
+
+ private void rebuildSubProfiles(DblTreeNode profNode, DblTreeNode topNode) {
+
+ // First unlink the old children
+ int childCount = profNode.getChildCount();
+ for (int i = 0; i < childCount; i++) {
+ DblTreeNode child = (DblTreeNode) srcModel.getChild(profNode, 0);
+ srcModel.removeNodeFromParent(child);
+ }
+
+ // Then recursively construct new nodes for all the children
+ DblTreeNode childNode;
+ int i = 0;
+ Enumeration topList = topNode.breadthFirstEnumeration();
+
+ // Find sub-profile list in RightObj of cached tree node
+ ProfTreeNode pTreeNode = (ProfTreeNode)profNode.getUserObject();
+ String rObj = pTreeNode.getRightObj();
+ // ProfAttrObj targetProfAttr = rObj.getProfAttr();
+
+ String [] profList = null; // targetProfAttr.getProfNames();
+
+ if (profList == null)
+ return;
+
+ for (int k = 0; k < profList.length; k++) {
+ String name = profList[k];
+
+ // Prevent infinite recursive loops
+ boolean cyclic = false;
+ while (topList.hasMoreElements()) {
+ if (name.equals(topList.nextElement().toString())) {
+ cyclic = true;
+ // Mark the parent as cyclic
+ topNode.setCyclic(true);
+ Enumeration dupNodes = topNode.breadthFirstEnumeration();
+ while (dupNodes.hasMoreElements()) {
+ childNode = (DblTreeNode)dupNodes.nextElement();
+ if (name.equals(childNode.toString())) {
+ childNode.setCyclic(true);
+ }
+ }
+ break;
+ }
+ }
+
+ for (int j = 0; j < profTreeNodes.length; j++) {
+ if (name.equals(profTreeNodes[j].toString())) {
+ childNode = new DblTreeNode((Object)profTreeNodes[j]);
+
+ srcModel.insertNodeInto(childNode, profNode, i++);
+ childNode.setEnabled(false);
+ if (cyclic)
+ childNode.setCyclic(true);
+ else
+ rebuildSubProfiles(childNode, topNode);
+ }
+ }
+ }
+
+ } // end rebuildSubProfiles
+
+
+ public String updateRightSubProps(String rightObj) {
+
+ if (isProfListOK) {
+ Vector<String> vAssignedProfs = new Vector<String>();
+
+ // Get the first generation children that are assigned to
+ // current profile.
+ DblTreeNode root = (DblTreeNode)dstModel.getRoot();
+ Enumeration kids;
+ kids = root.children();
+
+ while (kids.hasMoreElements()) {
+ DblTreeNode childNode;
+ childNode = (DblTreeNode)kids.nextElement();
+ vAssignedProfs.addElement(childNode.toString());
+ }
+
+ // ProfAttrObj profAttr = rightObj.getProfAttr();
+ // profAttr.setProfNamesVector(vAssignedProfs);
+ }
+ return (rightObj);
+
+ } // end updateRightSubProps
+
+ public Vector<String> getAssignedProfs() {
+ Vector<String> vAssignedProfs = new Vector<String>();
+
+ if (!isProfListOK) {
+ return vAssignedProfs;
+ }
+
+ // Get the first generation children that are assigned to
+ // current profile.
+ DblTreeNode root = (DblTreeNode)dstModel.getRoot();
+ Enumeration kids;
+ kids = root.children();
+ while (kids.hasMoreElements()) {
+ DblTreeNode childNode;
+ childNode = (DblTreeNode)kids.nextElement();
+ vAssignedProfs.addElement(childNode.toString());
+ }
+
+ return vAssignedProfs;
+ }
+
+ private Vector<String> getAvailableProfs() {
+ Vector<String> rights = new Vector<String>();
+ for (String s : panelDesc.getProfiles()) {
+ rights.add(s);
+
+ }
+ return (rights);
+ }
+
+ public void setUser(UserManagedObject userObj) {
+ this.userObj = userObj;
+ loadProfiles();
+ }
+
+ public UserManagedObject updateUser() {
+ Vector<String> vProfs = getAssignedProfs();
+ String profStr;
+
+ if (vProfs.size() > 0) {
+ profStr = vProfs.elementAt(0);
+ } else {
+ profStr = "";
+ }
+
+ for (int i = 1; i < vProfs.size(); i++) {
+ profStr = profStr.concat(",");
+ profStr = profStr.concat(vProfs.elementAt(i));
+ }
+
+ userObj.getAuthRightsProperty().setValue(profStr);
+
+ return (userObj);
+ }
+
+
+
+class ProfileRenderer extends DefaultTreeCellRenderer {
+
+ private boolean selected;
+ Icon warningIcon;
+ AuthRightsPanel rightsPanel;
+
+ public ProfileRenderer(AuthRightsPanel rightsPanel) {
+
+ this.rightsPanel = rightsPanel;
+ setClosedIcon(null);
+ setOpenIcon(null);
+ setLeafIcon(null);
+ warningIcon = Finder.getIcon("images/warning.gif");
+
+ }
+
+
+ public Component getTreeCellRendererComponent(
+ JTree tree,
+ Object value,
+ boolean selected,
+ boolean expanded,
+ boolean leaf,
+ int row,
+ boolean hasFocus) {
+
+ FocusEvent e = null;
+
+ this.selected = selected;
+
+ DefaultTreeCellRenderer cr =
+ (DefaultTreeCellRenderer)tree.getCellRenderer();
+ cr.setLeafIcon(null);
+ DblTreeNode node = (DblTreeNode)value;
+
+ if (node.getParent() == null) {
+ // maybe the same as row == 0
+ setText(node.toString());
+
+ } else if (node.getUserObject() instanceof ProfTreeNode) {
+ ProfTreeNode profsdef = (ProfTreeNode)node.getUserObject();
+ setText(profsdef.toString());
+ // setIcon(actionIcon);
+
+ if (node.isConflict())
+ if (tree == rightsPanel.profPanel.dstTree)
+ cr.setLeafIcon(warningIcon);
+ }
+
+ super.getTreeCellRendererComponent(tree, value, selected, expanded,
+ leaf, row, hasFocus);
+
+ return this;
+
+ } // end getTreeCellRendererComponent
+
+}
+
+class ProfTreeNode {
+
+ String name;
+ String rightObj = null;
+
+ public ProfTreeNode(String rightObj) {
+ this.rightObj = rightObj;
+ this.name = rightObj;
+ }
+
+ public String getRightObj() {
+ return rightObj;
+ }
+
+ public String toString() {
+ return name;
+ }
+
+}
+
+class NodeCompare implements Compare {
+
+ /**
+ * The compare method compares two ProfTreeNode objects by comparing
+ * their profile names. The parameters are specified as Object class
+ * objects for QuickSort.
+ *
+ * @param a The first Node.
+ * @param b The second Node.
+ *
+ */
+ public final int doCompare(Object a, Object b) {
+
+ ProfTreeNode e1, e2;
+ String e1Name, e2Name;
+
+ e1 = (ProfTreeNode)a;
+ e2 = (ProfTreeNode)b;
+ e1Name = e1.toString();
+ e2Name = e2.toString();
+ return (e1Name.compareTo(e2Name));
+
+ }
+
+}
+}
diff --git a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AuthRightsSettings.java b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AuthRightsSettings.java
new file mode 100644
index 0000000..0f23fdd
--- /dev/null
+++ b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/AuthRightsSettings.java
@@ -0,0 +1,78 @@
+/*
+ * 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 (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ */
+
+package com.oracle.solaris.vp.panels.usermgr.client.swing;
+
+import javax.swing.*;
+import com.oracle.solaris.vp.util.misc.finder.Finder;
+import com.oracle.solaris.vp.util.misc.property.*;
+
+/**
+ * Implements Advanced Settings for Authenticated Profiles
+ */
+public class AuthRightsSettings extends AdvancedSettings {
+
+ private static final String NAME =
+ Finder.getString("usermgr.advanced.auth_rights");
+ private static final Icon ICON = Finder.getIcon(
+ "images/rights-24.png");
+
+ private UserMgrPanelDescriptor panelDesc = null;
+ private UserManagedObject userObj = null;
+ private AuthRightsPanel panel = null;
+
+ public AuthRightsSettings() {
+ super(NAME, ICON);
+ }
+
+ public void setUser(UserManagedObject userObj) {
+ if (panel == null) {
+ panel = new AuthRightsPanel(panelDesc, userObj);
+ }
+ panel.setUser(userObj);
+ getProperty().update(userObj.getAuthRights(), false);
+ }
+
+ public void updateUser() {
+ userObj = panel.updateUser();
+ getProperty().update(userObj.getAuthRights(), false);
+ }
+
+ public boolean isChanged() {
+ if (userObj != null) {
+ return (userObj.getAuthRightsProperty().isChanged());
+ } else {
+ return false;
+ }
+ }
+
+ public void init(UserMgrPanelDescriptor panelDesc) {
+ this.panelDesc = panelDesc;
+ }
+
+ public JPanel getPanel() {
+ return panel;
+ }
+}
diff --git a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserManagedObject.java b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserManagedObject.java
index 620ee8e..f7a77fc 100644
--- a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserManagedObject.java
+++ b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserManagedObject.java
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
*/
package com.oracle.solaris.vp.panels.usermgr.client.swing;
@@ -70,6 +70,9 @@
private MutableProperty<String> rightsProperty =
new StringProperty();
+ private MutableProperty<String> authRightsProperty =
+ new StringProperty();
+
private MutableProperty<String> rolesProperty =
new StringProperty();
@@ -99,8 +102,8 @@
{
ChangeableAggregator aggregator = getChangeableAggregator();
aggregator.addChangeables(groupIdProperty, homeDirProperty,
- passProperty, shellProperty,
- rolesProperty, rightsProperty, authsProperty, groupsProperty,
+ passProperty, shellProperty, rolesProperty, rightsProperty,
+ authRightsProperty, authsProperty, groupsProperty,
userDescProperty, userIdProperty, userNameProperty);
}
@@ -125,6 +128,7 @@
rolesProperty.update(listToString(user.getRoles()), true);
rightsProperty.update(listToString(user.getProfiles()), true);
+ authRightsProperty.update(listToString(user.getAuthProfiles()), true);
authsProperty.update(listToString(user.getAuths()), true);
groupsProperty.update(listToString(user.getGroups()), true);
accountStatusProperty.update(user.getAccountStatus() == null ? ""
@@ -177,6 +181,7 @@
.append("\n\ttype: ")
.append(type == UserType.NORMAL ? "user" : "role")
.append("\n\trights: ").append(getRights())
+ .append("\n\tauth_rights: ").append(getAuthRights())
.append("\n\tauths: ").append(getAuths())
.append("\n\tgroups: ").append(getGroups())
.append("\n\troles: ").append(getRoles())
@@ -196,6 +201,7 @@
// Additional attributes
rolesProperty.update(listToString(user.getRoles()), true);
rightsProperty.update(listToString(user.getProfiles()), true);
+ authRightsProperty.update(listToString(user.getAuthProfiles()), true);
authsProperty.update(listToString(user.getAuths()), true);
groupsProperty.update(listToString(user.getGroups()), true);
@@ -219,9 +225,12 @@
return homeDirProperty;
}
-
public MutableProperty<String> getRightsProperty() {
return rightsProperty;
+ }
+
+ public MutableProperty<String> getAuthRightsProperty() {
+ return authRightsProperty;
}
public MutableProperty<String> getRolesProperty() {
@@ -296,6 +305,10 @@
return rightsProperty.getValue();
}
+ public String getAuthRights() {
+ return authRightsProperty.getValue();
+ }
+
public String getRoles() {
return rolesProperty.getValue();
}
@@ -351,6 +364,10 @@
newUser.setProfiles(stringToList(getRights()));
}
+ if (getAuthRights() != null) {
+ // System.out.println("new user auth rights:" + getAuthRights());
+ newUser.setAuthProfiles(stringToList(getAuthRights()));
+ }
if (getRoles() != null) {
// System.out.println("new user roles:" + getRoles());
newUser.setRoles(stringToList(getRoles()));
@@ -397,6 +414,13 @@
bChanged = true;
}
+ if (authRightsProperty.isChanged()) {
+ // System.out.println("mod user auth rights " + getAuthRights());
+ modUser.setAuthProfiles(stringToList(getAuthRights()));
+ modChanges.setAuthProfilesChanged(true);
+ bChanged = true;
+ }
+
if (rolesProperty.isChanged()) {
// System.out.println("mod user roles " + getRoles());
modUser.setRoles(stringToList(getRoles()));
diff --git a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserMgrPanelDescriptor.java b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserMgrPanelDescriptor.java
index 911bbf0..11dd113 100644
--- a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserMgrPanelDescriptor.java
+++ b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserMgrPanelDescriptor.java
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
*/
package com.oracle.solaris.vp.panels.usermgr.client.swing;
@@ -86,6 +86,7 @@
private List<String> shellList = null;
private List<Group> groupList = null;
private List<String> profileList = null;
+ private List<String> authProfileList = null;
private List<String> authList = null;
private List<String> roleList = null;
private List<String> supplgroups = null;
@@ -312,6 +313,7 @@
char[] password = null;
if (umo.getPassProperty().isChanged())
password = umo.getPassword();
+ // System.out.println(umo.toString());
getUserMgrBean().modifyUser(user, password, changes);
if (password != null)
Arrays.fill(password, (char)0);
@@ -383,7 +385,7 @@
0, 0, 0, 0,
"", "", "", "", "", "",
"", "", "", "", "", "",
- null, null, null, null, null, null);
+ null, null, null, null, null, null, null);
return defaultUser;
}
diff --git a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/help/usermgr-advtab.html b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/help/usermgr-advtab.html
index 17a20a5..174051a 100644
--- a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/help/usermgr-advtab.html
+++ b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/help/usermgr-advtab.html
@@ -26,7 +26,7 @@
-->
<!--
-Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
-->
<head>
<!-- GenHTML revision 25226-->
@@ -57,6 +57,9 @@
<li><p>Rights Profiles</p>
</li>
+<li><p>Authenticated Profiles</p>
+
+</li>
<li><p>Authorizations</p>
</li></ul>
diff --git a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/resources/Resources.properties b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/resources/Resources.properties
index f8a730b..50dfe5a 100644
--- a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/resources/Resources.properties
+++ b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/resources/Resources.properties
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -110,6 +110,9 @@
usermgr.advanced.rights = Rights Profiles
usermgr.advanced.rights.available = Available Rights:
usermgr.advanced.rights.granted = Granted Rights:
+usermgr.advanced.auth_rights = Authenticated Profiles
+usermgr.advanced.auth_rights.available = Available Profiles:
+usermgr.advanced.auth_rights.granted = Granted Profiles:
usermgr.advanced.roles = Roles
usermgr.advanced.roles.available = Available Roles:
usermgr.advanced.roles.assigned = Assigned Roles:
diff --git a/make-rules/ips-buildinfo.mk b/make-rules/ips-buildinfo.mk
index 247d38a..4cb0bd9 100644
--- a/make-rules/ips-buildinfo.mk
+++ b/make-rules/ips-buildinfo.mk
@@ -61,7 +61,7 @@
# the development build) of the Solaris Update is being built.
# This is set by the gatekeepers.
#
-BUILDID ?= 21
+BUILDID ?= 23
# Each (nightly) build of the code that produces packages needs to
# be uniquely identified so that packages produced by different
@@ -72,7 +72,7 @@
#
#NIGHTLYID ?= $(shell hg tip --template '{rev}\n')
#
-NIGHTLYID ?= 1
+NIGHTLYID ?= 0
#
# Branch Identifier. Used in the version section of the package name to
diff --git a/make-rules/setup.py.mk b/make-rules/setup.py.mk
index fbe81fd..0d24d4a 100644
--- a/make-rules/setup.py.mk
+++ b/make-rules/setup.py.mk
@@ -33,12 +33,20 @@
BUILD_32 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH32)-%/.built)
BUILD_64 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.built)
+BUILD_NO_ARCH = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH)-%/.built)
INSTALL_32 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH32)-%/.installed)
INSTALL_64 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.installed)
+INSTALL_NO_ARCH = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH)-%/.installed)
+
+TEST_NO_ARCH = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH)-%/.tested)
PYTHON_ENV = CC="$(CC)"
PYTHON_ENV += CFLAGS="$(CFLAGS)"
+
+COMPONENT_BUILD_ENV += $(PYTHON_ENV)
+COMPONENT_INSTALL_ENV += $(PYTHON_ENV)
+COMPONENT_TEST_ENV += $(PYTHON_ENV)
# if we are building python 2.7 support, build it and install it first
# so that python 2.6 is installed last and is the canonical version.
@@ -61,7 +69,7 @@
$(BUILD_DIR)/%/.built: $(SOURCE_DIR)/.prep $(BUILD_DIR)/config-%/$(CFG)
$(RM) -r $(@D) ; $(MKDIR) $(@D)
$(COMPONENT_PRE_BUILD_ACTION)
- (cd $(SOURCE_DIR) ; $(ENV) HOME=$(BUILD_DIR)/config-$* $(PYTHON_ENV) \
+ (cd $(SOURCE_DIR) ; $(ENV) HOME=$(BUILD_DIR)/config-$* $(COMPONENT_BUILD_ENV) \
$(PYTHON.$(BITS)) ./setup.py build)
$(COMPONENT_POST_BUILD_ACTION)
ifeq ($(strip $(PARFAIT_BUILD)),yes)
--
Gitblit v1.9.3