From dc06e43fd18c431cc9b725f8a8ddfe75b4d99ee1 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Sat, 26 Nov 2016 18:59:12 +0000 Subject: [PATCH 1/4] add a LICENSE file conforming to the contents of README.md and other files. --- LICENSE | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4749029 --- /dev/null +++ b/LICENSE @@ -0,0 +1,15 @@ +ISC License + +Copyright (c) 2009-2016 Conformal Systems LLC. + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, 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. From a76eac5db9c350db3c27c6b8efad2c764f8c134e Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Sat, 26 Nov 2016 19:01:34 +0000 Subject: [PATCH 2/4] the short identifier for the ISC License is "ISC" per the SPDX registry: https://spdx.org/licenses/ISC.html --- config/freebsd/security/assl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/freebsd/security/assl/Makefile b/config/freebsd/security/assl/Makefile index 6536515..7660218 100644 --- a/config/freebsd/security/assl/Makefile +++ b/config/freebsd/security/assl/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= https://opensource.conformal.com/snapshots/assl/ \ MAINTAINER= None COMMENT= hide awful SSL API in a sane interface -LICENSE= ISCL +LICENSE= ISC LICENSE_COMB= single BUILD_DEPENDS= ${LOCALBASE}/lib/libclens.a:${PORTSDIR}/devel/clens From 3041d14adc4cfec821163702b36536ca3dc272a2 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Sat, 26 Nov 2016 19:21:25 +0000 Subject: [PATCH 3/4] add license title and update copyright notice according to config/debian/copyright --- html/license.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/html/license.html b/html/license.html index 8f0a39e..801bc4b 100644 --- a/html/license.html +++ b/html/license.html @@ -6,7 +6,10 @@ /*
+ * ISC License
+ *
 * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
+ * 2011-2014, Conformal Systems LLC <info@conformal.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -21,6 +24,5 @@  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 - From 64d9e85d7359d99e5c0803c188eb7287a62cbc6c Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Sat, 26 Nov 2016 19:23:48 +0000 Subject: [PATCH 4/4] update copyright notice according to config/debian/copyright --- LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 4749029..55e6b8f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ ISC License -Copyright (c) 2009-2016 Conformal Systems LLC. +Copyright (c) 2009 Marco Peereboom + 2011-2014, Conformal Systems LLC Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above