23141943 Upgrade coverage to 4.0.3
22850194 update pycurl to 7.43.0
23184205 Upgrade m2crypto 0.24.0
23210148 Upgrade ply to 3.8
23184223 Upgrade mako to 1.0.4
--- a/components/python/coverage/Makefile Tue May 31 15:56:42 2016 -0700
+++ b/components/python/coverage/Makefile Tue May 31 16:41:45 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= coverage
-COMPONENT_VERSION= 4.0.1
+COMPONENT_VERSION= 4.0.3
COMPONENT_PROJECT_URL= http://nedbatchelder.com/code/coverage/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:bc10f57a83863e8ca8916f763f13b4b249e2f85b553df3958281cb7f4f402d5b
+ sha256:85b1275b6d7a61ccc8024a4e9a4c9e896394776edce1a5d075ec116f91925462
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_BUGDB= python-mod/coverage
-TPNO= 25051
+TPNO= 28339
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
--- a/components/python/m2crypto/Makefile Tue May 31 15:56:42 2016 -0700
+++ b/components/python/m2crypto/Makefile Tue May 31 16:41:45 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= M2Crypto
-COMPONENT_VERSION= 0.21.1
+COMPONENT_VERSION= 0.24.0
COMPONENT_PROJECT_URL= http://chandlerproject.org/Projects/MeTooCrypto/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a
+ sha256:80a56441a1d2c0cf27e725be7554c92598b938fc8767ee2c71fdbc2fdc055ee8
COMPONENT_ARCHIVE_URL= http://pypi.python.org/packages/source/M/M2Crypto/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= python-mod/m2crypto
-TPNO= 4424
+TPNO= 28340
# Syntax issues: not Python 3 ready.
PYTHON_VERSIONS= $(PYTHON2_VERSIONS)
--- a/components/python/m2crypto/patches/crl.patch Tue May 31 15:56:42 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-diff -r 886cd7fb12ed M2Crypto-0.21.1/M2Crypto/X509.py
---- M2Crypto-0.21.1/M2Crypto/X509.py Thu Mar 10 14:07:58 2011 -0800
-+++ M2Crypto-0.21.1/M2Crypto/X509.py Fri Mar 11 09:03:37 2011 -0800
-@@ -446,9 +446,9 @@
- assert m2.x509_type_check(self.x509), "'x509' type error"
- return ASN1.ASN1_UTCTIME(m2.x509_get_not_after(self.x509))
-
-- def get_pubkey(self):
-+ def get_pubkey(self, md="sha1"):
- assert m2.x509_type_check(self.x509), "'x509' type error"
-- return EVP.PKey(m2.x509_get_pubkey(self.x509), _pyfree=1)
-+ return EVP.PKey(m2.x509_get_pubkey(self.x509), _pyfree=1, md=md)
-
- def set_pubkey(self, pkey):
- """
-@@ -1067,7 +1067,8 @@
- else:
- self.crl = m2.x509_crl_new()
- self._pyfree = 1
--
-+ self.revocations = None
-+
- def __del__(self):
- if getattr(self, '_pyfree', 0):
- self.m2_x509_crl_free(self.crl)
-@@ -1084,21 +1085,67 @@
- return buf.read_all()
-
-
--def load_crl(file):
-+ def get_last_update(self):
-+ assert m2.x509_CRL_type_check(self.crl), "'x509_CRL' type error"
-+ return ASN1.ASN1_UTCTIME(m2.x509_CRL_get_last_update(self.crl))
-+
-+ def get_next_update(self):
-+ assert m2.x509_CRL_type_check(self.crl), "'x509_CRL' type error"
-+ return ASN1.ASN1_UTCTIME(m2.x509_CRL_get_next_update(self.crl))
-+
-+ def verify(self, pkey):
-+ assert m2.x509_CRL_type_check(self.crl), "'x509_CRL' type error"
-+ return m2.x509_CRL_verify(self.crl, pkey.pkey)
-+
-+ def get_issuer(self):
-+ assert m2.x509_CRL_type_check(self.crl), "'x509_CRL' type error"
-+ return X509_Name(m2.x509_CRL_get_issuer(self.crl))
-+
-+ def is_revoked(self, cert):
-+ if self.revocations is None:
-+ self.revocations = {}
-+ revo_stk_ptr = m2.x509_CRL_get_revoked(self.crl)
-+ for i in range(m2.sk_x509_REVOKED_num(revo_stk_ptr)):
-+ revo_ptr = m2.sk_x509_REVOKED_get(revo_stk_ptr, i)
-+ revo_sn = m2.asn1_integer_get(
-+ m2.x509_REVOKED_get_serial_number(revo_ptr))
-+ cnt = m2.x509_REVOKED_get_ext_count(revo_ptr)
-+ reason = None
-+ for i in range(m2.x509_REVOKED_get_ext_count(revo_ptr)):
-+ ext_ptr = m2.x509_REVOKED_get_ext(revo_ptr, i)
-+ name = m2.x509_extension_get_name(ext_ptr)
-+ if name == "CRLReason":
-+ ext = X509_Extension(ext_ptr, _pyfree=0)
-+ reason = ext.get_value()
-+ self.revocations[revo_sn] = (True, reason)
-+ return self.revocations.get(cert.get_serial_number(), None)
-+
-+
-+def load_crl(file, format=FORMAT_PEM):
- """
- Load CRL from file.
-
- @type file: string
- @param file: Name of file containing CRL in PEM format.
-
-+ @type format: int, either FORMAT_PEM or FORMAT_DER
-+ @param format: Describes the format of the file to be loaded, either PEM or DER.
-+
- @rtype: M2Crypto.X509.CRL
- @return: M2Crypto.X509.CRL object.
- """
- f=BIO.openfile(file)
-- cptr=m2.x509_crl_read_pem(f.bio_ptr())
-- f.close()
-- if cptr is None:
-- raise X509Error(Err.get_error())
-- return CRL(cptr, 1)
--
--
-+ if format == FORMAT_PEM:
-+ cptr=m2.x509_crl_read_pem(f.bio_ptr())
-+ f.close()
-+ if cptr is None:
-+ raise X509Error(Err.get_error())
-+ return CRL(cptr, 1)
-+ elif format == FORMAT_DER:
-+ cptr=m2.d2i_x509_crl(f._ptr())
-+ f.close()
-+ if cptr is None:
-+ raise X509Error(Err.get_error())
-+ return CRL(cptr, 1)
-+ else:
-+ raise ValueError("Unknown format. Must be either FORMAT_DER or FORMAT_PEM")
-diff -r 886cd7fb12ed M2Crypto-0.21.1/SWIG/_x509.i
---- M2Crypto-0.21.1/SWIG/_x509.i Thu Mar 10 14:07:58 2011 -0800
-+++ M2Crypto-0.21.1/SWIG/_x509.i Fri Mar 11 09:03:37 2011 -0800
-@@ -64,6 +64,9 @@
- %rename(x509_cmp_current_time) X509_cmp_current_time;
- extern int X509_cmp_current_time(ASN1_UTCTIME *);
-
-+%rename(x509_CRL_get_issuer) X509_CRL_get_issuer;
-+extern X509_NAME *X509_CRL_get_issuer(X509_CRL *);
-+
-
- /* From x509.h */
- /* standard trust ids */
-@@ -111,6 +114,9 @@
- %rename(x509_get_verify_error) X509_verify_cert_error_string;
- extern const char *X509_verify_cert_error_string(long);
-
-+%rename(x509_CRL_verify) X509_CRL_verify;
-+extern int X509_CRL_verify(X509_CRL *a, EVP_PKEY *r);
-+
- %constant long X509V3_EXT_UNKNOWN_MASK = (0xfL << 16);
- %constant long X509V3_EXT_DEFAULT = 0;
- %constant long X509V3_EXT_ERROR_UNKNOWN = (1L << 16);
-@@ -127,6 +133,13 @@
- %threadallow X509V3_EXT_print;
- extern int X509V3_EXT_print(BIO *, X509_EXTENSION *, unsigned long, int);
-
-+%rename(x509_REVOKED_get_ext_count) X509_REVOKED_get_ext_count;
-+extern int X509_REVOKED_get_ext_count(X509_REVOKED *);
-+%rename(x509_REVOKED_get_ext) X509_REVOKED_get_ext;
-+extern X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *, int);
-+%rename(x509_REVOKED_get_ext_by_NID) X509_REVOKED_get_ext_by_NID;
-+extern X509_EXTENSION *X509_REVOKED_get_ext_by_NID(X509_REVOKED *, int, int);
-+
- %rename(x509_name_new) X509_NAME_new;
- extern X509_NAME *X509_NAME_new( void );
- %rename(x509_name_free) X509_NAME_free;
-@@ -335,6 +348,7 @@
- }
- %}
-
-+
- %threadallow d2i_x509;
- %inline %{
- X509 *d2i_x509(BIO *bio) {
-@@ -342,6 +356,13 @@
- }
- %}
-
-+%threadallow d2i_x509_crl;
-+%inline %{
-+X509_CRL *d2i_x509_crl(BIO *bio) {
-+ return d2i_X509_CRL_bio(bio, NULL);
-+}
-+%}
-+
- %threadallow d2i_x509_req;
- %inline %{
- X509_REQ *d2i_x509_req(BIO *bio) {
-@@ -415,6 +436,33 @@
- return X509_get_notAfter(x);
- }
-
-+/* X509_CRL_get_lastUpdate() is a macro. */
-+ASN1_UTCTIME *x509_CRL_get_last_update(X509_CRL *x) {
-+ return X509_CRL_get_lastUpdate(x);
-+}
-+
-+/* X509_CRL_get_nextUpdate() is a macro. */
-+ASN1_UTCTIME *x509_CRL_get_next_update(X509_CRL *x) {
-+ return X509_CRL_get_nextUpdate(x);
-+}
-+
-+/* X509_CRL_get_REVOKED() is a macro. */
-+STACK_OF(X509_REVOKED) *x509_CRL_get_revoked(X509_CRL *x) {
-+ return X509_CRL_get_REVOKED(x);
-+}
-+
-+int sk_x509_REVOKED_num(STACK_OF(X509_REVOKED) *stack) {
-+ return sk_X509_REVOKED_num(stack);
-+}
-+
-+X509_REVOKED *sk_x509_REVOKED_get(STACK_OF(X509_REVOKED) *stack, int x) {
-+ return sk_X509_REVOKED_value(stack, x);
-+}
-+
-+ASN1_INTEGER *x509_REVOKED_get_serial_number(X509_REVOKED *x) {
-+ return x->serialNumber;
-+}
-+
- int x509_sign(X509 *x, EVP_PKEY *pkey, EVP_MD *md) {
- return X509_sign(x, pkey, md);
- }
-@@ -487,6 +535,10 @@
- return 1;
- }
-
-+int x509_CRL_type_check(X509_CRL *x509_CRL) {
-+ return 1;
-+}
-+
- int x509_name_type_check(X509_NAME *name) {
- return 1;
- }
--- a/components/python/m2crypto/patches/swig-3.0.5.patch Tue May 31 15:56:42 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-#
-# Based on community discussion at
-# https://github.com/martinpaljak/M2Crypto/issues/60
-#
-diff --git a/SWIG/_lib.i b/SWIG/_lib.i
-index 0d40698..c74e531 100644
---- a/SWIG/_lib.i
-+++ b/SWIG/_lib.i
-@@ -66,6 +66,8 @@ int ssl_verify_callback(int ok, X509_STORE_CTX *ctx) {
- int cret;
- int new_style_callback = 0, warning_raised_exception=0;
- PyGILState_STATE gilstate;
-+ PyObject *self = 0;
-+ (void)self;
-
- ssl = (SSL *)X509_STORE_CTX_get_app_data(ctx);
-
-@@ -151,6 +153,8 @@ int ssl_verify_callback(int ok, X509_STORE_CTX *ctx) {
- void ssl_info_callback(const SSL *s, int where, int ret) {
- PyObject *argv, *retval, *_SSL;
- PyGILState_STATE gilstate;
-+ PyObject *self = 0;
-+ (void)self;
-
- gilstate = PyGILState_Ensure();
-
-@@ -170,6 +174,8 @@ DH *ssl_set_tmp_dh_callback(SSL *ssl, int is_export, int keylength) {
- PyObject *argv, *ret, *_ssl;
- DH *dh;
- PyGILState_STATE gilstate;
-+ PyObject *self = 0;
-+ (void)self;
-
- gilstate = PyGILState_Ensure();
-
-@@ -193,6 +199,8 @@ RSA *ssl_set_tmp_rsa_callback(SSL *ssl, int is_export, int keylength) {
- PyObject *argv, *ret, *_ssl;
- RSA *rsa;
- PyGILState_STATE gilstate;
-+ PyObject *self = 0;
-+ (void)self;
-
- gilstate = PyGILState_Ensure();
-
-diff --git a/SWIG/_pkcs7.i b/SWIG/_pkcs7.i
-index 22d791a..92b1aeb 100644
---- a/SWIG/_pkcs7.i
-+++ b/SWIG/_pkcs7.i
-@@ -157,6 +157,8 @@ PyObject *smime_read_pkcs7(BIO *bio) {
- BIO *bcont = NULL;
- PKCS7 *p7;
- PyObject *tuple, *_p7, *_BIO;
-+ PyObject *self = 0;
-+ (void)self;
-
- if (BIO_method_type(bio) == BIO_TYPE_MEM) {
- /* OpenSSL FAQ explains that this is needed for mem BIO to return EOF,
-
---- M2Crypto-0.21.1/setup.py Sat Jan 15 13:10:06 2011
-+++ M2Crypto-0.21.1.new/setup.py Sat Jan 15 13:10:06 2011
-@@ -57,6 +57,7 @@
- self.swig_opts.append('-includeall')
- #self.swig_opts.append('-D__i386__') # Uncomment for early OpenSSL 0.9.7 versions, or on Fedora Core if build fails
- #self.swig_opts.append('-DOPENSSL_NO_EC') # Try uncommenting if you can't build with EC disabled
-+ self.swig_opts.append('-builtin')
-
- self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
- os.path.join(os.getcwd(), 'SWIG')]
-
--- a/components/python/mako/Makefile Tue May 31 15:56:42 2016 -0700
+++ b/components/python/mako/Makefile Tue May 31 16:41:45 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= Mako
-COMPONENT_VERSION= 1.0.0
+COMPONENT_VERSION= 1.0.4
COMPONENT_PROJECT_URL= http://www.makotemplates.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:a3cd72cfef507204b50f74ffcbfcfde7e856437891d3f6cfe780866986d006fe
+ sha256:fed99dbe4d0ddb27a33ee4910d8708aca9ef1fe854e668387a9ab9a90cbf9059
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_BUGDB= python-mod/mako
-TPNO= 20425
+TPNO= 28338
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
--- a/components/python/ply/Makefile Tue May 31 15:56:42 2016 -0700
+++ b/components/python/ply/Makefile Tue May 31 16:41:45 2016 -0700
@@ -20,26 +20,23 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
COMPONENT_NAME= ply
-COMPONENT_VERSION= 3.7
+COMPONENT_VERSION= 3.8
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:f85fb7b44c1c9a04873e6d76fa2c2eef43f2cfd81468aa714a9c63af7ae0af80
+ sha256:e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8
COMPONENT_ARCHIVE_URL= http://www.dabeaz.com/ply/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL= http://www.dabeaz.com/ply/
COMPONENT_BUGDB= python-mod/ply
-TPNO= 24766
-
-# not Python 3.5 ready; test fail
-PYTHON_VERSIONS= $(PYTHON2_VERSIONS) 3.4
+TPNO= 28341
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
--- a/components/python/ply/ply-PYVER.p5m Tue May 31 15:56:42 2016 -0700
+++ b/components/python/ply/ply-PYVER.p5m Tue May 31 16:41:45 2016 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -46,6 +46,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/ply/ctokens.py
file path=usr/lib/python$(PYVER)/vendor-packages/ply/lex.py
file path=usr/lib/python$(PYVER)/vendor-packages/ply/yacc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ply/ygen.py
#
license ply.license license=BSD
--- a/components/python/pycurl/Makefile Tue May 31 15:56:42 2016 -0700
+++ b/components/python/pycurl/Makefile Tue May 31 16:41:45 2016 -0700
@@ -20,27 +20,22 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= pycurl
-COMPONENT_VERSION= 7.19.5.1
+COMPONENT_VERSION= 7.43.0
COMPONENT_PROJECT_URL= http://pycurl.sourceforge.net/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:6e9770f80459757f73bd71af82fbb29cd398b38388cdf1beab31ea91a331bc6c
+ sha256:aa975c19b79b6aa6c0518c0cc2ae33528900478f0b500531dbcdbf05beec584c
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_BUGDB= python-mod/pycurl
-IPS_COMPONENT_VERSION= 7.19.5.1
-
-TPNO= 24764
-
-# upstream not Python 3.5 ready
-PYTHON_VERSIONS= $(PYTHON2_VERSIONS) 3.4
+TPNO= 28055
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycurl/patches/easy.patch Tue May 31 16:41:45 2016 -0700
@@ -0,0 +1,23 @@
+ easy.c wouldn't compile on Solaris #399
+ https://github.com/pycurl/pycurl/issues/399
+
+ This issue has been reported upstream and the patch has been merged.
+
+--- a/src/easy.c
++++ b/src/easy.c
+@@ -653,12 +653,12 @@ convert_protocol_address(struct sockaddr* saddr, unsigned int saddrlen)
+ #if !defined(WIN32)
+ case AF_UNIX:
+ {
+- struct sockaddr_un* sun = (struct sockaddr_un*)saddr;
++ struct sockaddr_un* s_un = (struct sockaddr_un*)saddr;
+
+ #if PY_MAJOR_VERSION >= 3
+- res_obj = Py_BuildValue("y", sun->sun_path);
++ res_obj = Py_BuildValue("y", s_un->sun_path);
+ #else
+- res_obj = Py_BuildValue("s", sun->sun_path);
++ res_obj = Py_BuildValue("s", s_un->sun_path);
+ #endif
+ }
+ break;
--- a/components/python/pycurl/pycurl-GENFRAG.p5m Tue May 31 15:56:42 2016 -0700
+++ b/components/python/pycurl/pycurl-GENFRAG.p5m Tue May 31 16:41:45 2016 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
# we have to reverse the autopyc transform for stuff in /usr/share/doc
@@ -34,6 +34,9 @@
file path=usr/share/doc/pycurl/examples/basicfirst.py
file path=usr/share/doc/pycurl/examples/file_upload.py
file path=usr/share/doc/pycurl/examples/linksys.py
+file path=usr/share/doc/pycurl/examples/quickstart/file_upload_buffer.py
+file path=usr/share/doc/pycurl/examples/quickstart/file_upload_real.py
+file path=usr/share/doc/pycurl/examples/quickstart/file_upload_real_fancy.py
file path=usr/share/doc/pycurl/examples/quickstart/follow_redirect.py
file path=usr/share/doc/pycurl/examples/quickstart/form_post.py
file path=usr/share/doc/pycurl/examples/quickstart/get.py
@@ -46,6 +49,7 @@
file path=usr/share/doc/pycurl/examples/retriever.py
file path=usr/share/doc/pycurl/examples/sfquery.py
file path=usr/share/doc/pycurl/examples/smtp.py
+file path=usr/share/doc/pycurl/examples/ssh_keyfunction.py
file path=usr/share/doc/pycurl/examples/xmlrpc_curl.py
#
license pycurl.copyright license=MIT
--- a/components/python/pycurl/pycurl.copyright Tue May 31 15:56:42 2016 -0700
+++ b/components/python/pycurl/pycurl.copyright Tue May 31 16:41:45 2016 -0700
@@ -1,5 +1,3 @@
-The following attribution text was taken from pycurl 7.19.5.1.
-
Pycurl is dual-licensed under the LGPL and an MIT/X derivative license based on the curl license. Sun chose the MIT-style license, and the OSR review stipulated that the following notice be prepended to the license:
Oracle elects to have this file available under and governed by the MIT-like license (see below for full icense text). However, the following notice accompanied the original version of the file:
@@ -13,7 +11,7 @@
Copyright (C) 2001-2008 by Kjetil Jacobsen <kjetilja at gmail.com>
Copyright (C) 2001-2008 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
-Copyright (C) 2013-2014 by Oleg Pudeyev <oleg at bsdpower.com>
+Copyright (C) 2013-2016 by Oleg Pudeyev <oleg at bsdpower.com>
All rights reserved.
@@ -30,7 +28,7 @@
Copyright (C) 2001-2008 by Kjetil Jacobsen <kjetilja at gmail.com>
Copyright (C) 2001-2008 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
-Copyright (C) 2013-2014 by Oleg Pudeyev <oleg at bsdpower.com>
+Copyright (C) 2013-2016 by Oleg Pudeyev <oleg at bsdpower.com>
All rights reserved.
@@ -49,518 +47,3 @@
Except as contained in this notice, the name of a copyright holder shall not
be used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization of the copyright holder.
-
-
-The COPYING-LGPL file has the usual LGPL 2.1:
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!