From 24084d1a5d2a2341749ea04ef19d0414ebcb115e Mon Sep 17 00:00:00 2001 From: guoxiaoqi Date: Thu, 7 May 2020 10:15:44 +0800 Subject: [PATCH] update LICENSE of files --- openEuler-security.service | 8 ++++---- security | 8 ++++---- security-tool-2.0/csh.precmd | 8 ++++---- security-tool-2.0/password-auth-crond | 8 ++++---- security-tool-2.0/su-local | 8 ++++---- security-tool-2.0/zzz_openEuler_history.csh | 8 ++++---- security-tool-2.0/zzz_openEuler_history.sh | 8 ++++---- security-tool.spec | 7 +++++-- security.conf | 8 ++++---- 9 files changed, 37 insertions(+), 34 deletions(-) diff --git a/openEuler-security.service b/openEuler-security.service index bdc1a1c..ab60920 100644 --- a/openEuler-security.service +++ b/openEuler-security.service @@ -1,14 +1,14 @@ ####################################################################################### # # Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -# security-tool licensed under the Mulan PSL v1. -# You can use this software according to the terms and conditions of the Mulan PSL v1. -# You may obtain a copy of Mulan PSL v1 at: +# security-tool licensed under the Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: # http://license.coscl.org.cn/MulanPSL # THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # PURPOSE. -# See the Mulan PSL v1 for more details. +# See the Mulan PSL v2 for more details. # Description: Security Tool Activation Service # ####################################################################################### diff --git a/security b/security index 21f6c9d..a3d87ac 100644 --- a/security +++ b/security @@ -1,14 +1,14 @@ ####################################################################################### # # Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -# security-tool licensed under the Mulan PSL v1. -# You can use this software according to the terms and conditions of the Mulan PSL v1. -# You may obtain a copy of Mulan PSL v1 at: +# security-tool licensed under the Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: # http://license.coscl.org.cn/MulanPSL # THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # PURPOSE. -# See the Mulan PSL v1 for more details. +# See the Mulan PSL v2 for more details. # Description: Configuration file for the openEuler-security service. # ####################################################################################### diff --git a/security-tool-2.0/csh.precmd b/security-tool-2.0/csh.precmd index ab8510c..ee59457 100644 --- a/security-tool-2.0/csh.precmd +++ b/security-tool-2.0/csh.precmd @@ -1,14 +1,14 @@ ####################################################################################### # # Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -# security-tool licensed under the Mulan PSL v1. -# You can use this software according to the terms and conditions of the Mulan PSL v1. -# You may obtain a copy of Mulan PSL v1 at: +# security-tool licensed under the Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: # http://license.coscl.org.cn/MulanPSL # THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # PURPOSE. -# See the Mulan PSL v1 for more details. +# See the Mulan PSL v2 for more details. # Description: Append the history list to the history file. # ####################################################################################### diff --git a/security-tool-2.0/password-auth-crond b/security-tool-2.0/password-auth-crond index 83e9632..11ddabf 100644 --- a/security-tool-2.0/password-auth-crond +++ b/security-tool-2.0/password-auth-crond @@ -1,14 +1,14 @@ ####################################################################################### # # Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -# security-tool licensed under the Mulan PSL v1. -# You can use this software according to the terms and conditions of the Mulan PSL v1. -# You may obtain a copy of Mulan PSL v1 at: +# security-tool licensed under the Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: # http://license.coscl.org.cn/MulanPSL # THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # PURPOSE. -# See the Mulan PSL v1 for more details. +# See the Mulan PSL v2 for more details. # Description: Configuration File for PAMified Services # ####################################################################################### diff --git a/security-tool-2.0/su-local b/security-tool-2.0/su-local index f595026..9913ebd 100644 --- a/security-tool-2.0/su-local +++ b/security-tool-2.0/su-local @@ -1,14 +1,14 @@ ####################################################################################### # # Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -# security-tool licensed under the Mulan PSL v1. -# You can use this software according to the terms and conditions of the Mulan PSL v1. -# You may obtain a copy of Mulan PSL v1 at: +# security-tool licensed under the Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: # http://license.coscl.org.cn/MulanPSL # THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # PURPOSE. -# See the Mulan PSL v1 for more details. +# See the Mulan PSL v2 for more details. # Description: Configuration File for PAMified Services # ####################################################################################### diff --git a/security-tool-2.0/zzz_openEuler_history.csh b/security-tool-2.0/zzz_openEuler_history.csh index 423279c..85042a3 100644 --- a/security-tool-2.0/zzz_openEuler_history.csh +++ b/security-tool-2.0/zzz_openEuler_history.csh @@ -1,14 +1,14 @@ ####################################################################################### # # Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -# security-tool licensed under the Mulan PSL v1. -# You can use this software according to the terms and conditions of the Mulan PSL v1. -# You may obtain a copy of Mulan PSL v1 at: +# security-tool licensed under the Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: # http://license.coscl.org.cn/MulanPSL # THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # PURPOSE. -# See the Mulan PSL v1 for more details. +# See the Mulan PSL v2 for more details. # Description: Append the history list to the history file. # ####################################################################################### diff --git a/security-tool-2.0/zzz_openEuler_history.sh b/security-tool-2.0/zzz_openEuler_history.sh index 0a805a4..02296de 100644 --- a/security-tool-2.0/zzz_openEuler_history.sh +++ b/security-tool-2.0/zzz_openEuler_history.sh @@ -1,14 +1,14 @@ ####################################################################################### # # Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -# security-tool licensed under the Mulan PSL v1. -# You can use this software according to the terms and conditions of the Mulan PSL v1. -# You may obtain a copy of Mulan PSL v1 at: +# security-tool licensed under the Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: # http://license.coscl.org.cn/MulanPSL # THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # PURPOSE. -# See the Mulan PSL v1 for more details. +# See the Mulan PSL v2 for more details. # Description: Append the history list to the history file. # ####################################################################################### diff --git a/security-tool.spec b/security-tool.spec index 380dee4..375d1ae 100644 --- a/security-tool.spec +++ b/security-tool.spec @@ -1,7 +1,7 @@ Summary: openEuler Security Tool Name : security-tool Version: 2.0 -Release: 1.44 +Release: 1.45 Source0: %{name}-%{version}.tar.bz2 Source1: security Source2: security.conf @@ -124,8 +124,11 @@ fi %attr(0500,root,root) %{_sbindir}/security-tool.sh %changelog +* Thu May 7 2020 openEuler Buildteam - 2.0-1.45 +- Update LICENSE of files + * Wed Apr 29 2020 openEuler Buildteam - 2.0-1.44 -- Allow wheel group to use sudo by default +- Update LICENSE to Mulan PSL v2.0 * Fri Feb 21 2020 openEuler Buildteam - 2.0-1.43 - Allow wheel group to use sudo by default diff --git a/security.conf b/security.conf index 6819d2e..6d84318 100644 --- a/security.conf +++ b/security.conf @@ -1,14 +1,14 @@ ####################################################################################### # # Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -# security-tool licensed under the Mulan PSL v1. -# You can use this software according to the terms and conditions of the Mulan PSL v1. -# You may obtain a copy of Mulan PSL v1 at: +# security-tool licensed under the Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: # http://license.coscl.org.cn/MulanPSL # THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # PURPOSE. -# See the Mulan PSL v1 for more details. +# See the Mulan PSL v2 for more details. # Description: Configuration file for the security-tool. # ####################################################################################### -- Gitee