diff --git a/openEuler-security.service b/openEuler-security.service index bdc1a1c0801fd3566b7cd689ea0b2e582afd0829..ab60920f954a682220793d93a221239dd4acf48d 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 21f6c9d38750344bc4881f0bc3ffa3f295d4cc51..a3d87ac647bd5afc722079072b8442f87aee8bb8 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 ab8510c93ff3e2463104d0c8c9dae02dde698290..ee59457731cbc04418604d0261a26d9aec0b84b9 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 83e9632c7aa516d4abe071aced8fe1a22b3bdfa1..11ddabfcafd19c7b7a128ecdd1193eb9c9b4de3e 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 f595026921135d8e95388e9a3594c08a016dca26..9913ebd5512ff5024a8ff2fea133ed577a01f3af 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 423279ccdea1dd46bd822b5b39276871ec765181..85042a3c4a6fbba9774861d294300d8385a93eb0 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 0a805a464c0c41c59c4af435e6ac0f3829707f8b..02296deae352f3a1f0cf44d03edaa2e8e499c1a9 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 380dee48b6ed8ffc6110c36301ebdf0f58af73c9..375d1ae7d5018400ed4b3f1ca32fe389c9d6816a 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 6819d2eb3c399799180b734dbf392f652b0ffdd8..6d84318ea9abbd834d87e774fad1019d354686b0 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. # #######################################################################################