This is an automated email from the ASF dual-hosted git repository.

hsun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git

commit f96278cafc6f1675194cb91fa0764a8bb65e2bae
Author: sunhe05 <sunh...@baidu.com>
AuthorDate: Tue Apr 25 02:11:43 2023 +0000

    Update LICENSE and NOTICE
---
 LICENSE                           | 12 ++----------
 NOTICE                            |  2 +-
 licenses/LICENSE-crates-io.txt    | 13 -------------
 licenses/LICENSE-crates-sgx.txt   | 13 -------------
 licenses/LICENSE-protected-fs.txt | 29 -----------------------------
 5 files changed, 3 insertions(+), 66 deletions(-)

diff --git a/LICENSE b/LICENSE
index 74412ab3..a3a6d984 100644
--- a/LICENSE
+++ b/LICENSE
@@ -211,19 +211,11 @@ licenses/ for text of these licenses.
 Apache License, Version 2.0
 ---------------------------
 
-third-party/crates-io
-third-party/crates-sgx
 third_party/wasm-micro-runtime
-
-
-BSD 3-Clause License
---------------------
-
-common/protected_fs_rs/protected_fs_c
-
+third_party/rust-sgx-sdk
 
 MIT License
 -----------
 
-third_party/mesapy
 common/rusty_leveldb_sgx
+https://github.com/mesatee/mesapy/releases/download/v1.0.0-sgx/mesapy-v1.0.0-sgx.tar.gz
diff --git a/NOTICE b/NOTICE
index 8d84f50e..063821e1 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Teaclave (incubating)
-Copyright 2019-2022 The Apache Software Foundation
+Copyright 2019-2023 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/licenses/LICENSE-crates-io.txt b/licenses/LICENSE-crates-io.txt
deleted file mode 100644
index 2a3aa8fe..00000000
--- a/licenses/LICENSE-crates-io.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2019 crates-io
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/licenses/LICENSE-crates-sgx.txt b/licenses/LICENSE-crates-sgx.txt
deleted file mode 100644
index a1ec16c5..00000000
--- a/licenses/LICENSE-crates-sgx.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2019 crates-sgx
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/licenses/LICENSE-protected-fs.txt 
b/licenses/LICENSE-protected-fs.txt
deleted file mode 100644
index 1b30c3a0..00000000
--- a/licenses/LICENSE-protected-fs.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-BSD License
-
-Copyright (C) 2011-2019 Intel Corporation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-  * Neither the name of Intel Corporation nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@teaclave.apache.org
For additional commands, e-mail: commits-h...@teaclave.apache.org

Reply via email to