0002-hdparam-Remove-security_password-printing.patch

@@ -1,50 +0,0 @@
-From deaa52e44c5464a8360e540d7b35895bc51e5143 Mon Sep 17 00:00:00 2001
-From: Wenchao Hao <haowenchao@huawei.com>
-Date: Mon, 30 Nov 2020 17:29:55 +0800
-Subject: [PATCH] hdparam: Remove security_password printing
-
-In consideration of security, passwd should not printed
-in log, so this commit remove security_password printing
-in code.
-
-Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
-Signed-off-by: volcanodragon <linfeilong@huawei.com>
----
- hdparm.c | 15 ++-------------
- 1 file changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/hdparm.c b/hdparm.c
-index 8045c87..3282d93 100644
---- a/hdparm.c
-+++ b/hdparm.c
-@@ -989,8 +989,8 @@ do_set_security (int fd)
- 			exit(EINVAL);
- 	}
- 	if (!quiet) {
--		printf(" Issuing %s command, password=\"%s\", user=%s",
--			description, security_password, (data[0] & 1) ? "master" : "user");
-+		printf(" Issuing %s command, user=%s",
-+			description, (data[0] & 1) ? "master" : "user");
- 		if (security_command == ATA_OP_SECURITY_SET_PASS)
- 			printf(", mode=%s", data[1] ? "max" : "high");
- 		printf("\n");
-@@ -3004,17 +3004,6 @@ static void get_security_password (int handle_NULL)
- 	} else if (!handle_NULL || strcmp(argp, "NULL")) {
- 		strcpy(security_password, argp);
- 	}
--	printf("security_password:");
--	if (!binary_passwd) {
--		printf(" \"%s\"\n", security_password);
--	} else {
--		unsigned int i;
--		for (i = 0; i < maxlen; ++i) {
--			unsigned char c = security_password[i];
--			printf(" %02x", c);
--		}
--		putchar('\n');
--	}
- 	while (*argp)
- 		++argp;
- }
--- 
-2.27.0

0003-hdparm-fix-fd-leak-in-sysfs_write_attr.patch

@@ -1,33 +0,0 @@
-From ac3b725928b6b6c4a1188670a67ed5432744de26 Mon Sep 17 00:00:00 2001
-From: Zhiqiang Liu <liuzhiqiang26@huawei.com>
-Date: Tue, 1 Mar 2022 15:47:02 +0800
-Subject: [PATCH] hdparm: fix fd leak in sysfs_write_attr()
-
-In sysfs_write_attr(), if "fmt[0] != %", will return without
-close fp.
-
-Fix issue: https://gitee.com/src-openeuler/hdparm/issues/I4S2C0
-
-Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
----
- sysfs.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/sysfs.c b/sysfs.c
-index 60b8146..722b2a9 100644
---- a/sysfs.c
-+++ b/sysfs.c
-@@ -60,8 +60,9 @@ static int sysfs_write_attr (char *path, const char *attr, const char *fmt, void
- 		}
- 		if (count < 0)
- 			err = errno;
--		fclose(fp);
- 	}
-+	if (!fp)
-+		fclose(fp);
- 	if (err && verbose) perror(path);
- 	*pathtail = '\0';
- 	return err;
--- 
-1.8.3.1
-

hdparm.spec

@@ -1,13 +1,11 @@
 Name:      hdparm
-Version:   9.65
+Version:   9.58
-Release:   1
+Release:   2
 Summary:   A system utility for setting or showing hard drive parameters
-License:   BSD AND GPLv2
+License:   BSD
 URL:       https://sourceforge.net/projects/%{name}/
 Source0:   https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:    0001-hdparm-fallocate-close-fd.patch
-Patch2:    0002-hdparam-Remove-security_password-printing.patch
-Patch3:    0003-hdparm-fix-fd-leak-in-sysfs_write_attr.patch
 
 BuildRequires: gcc 
 
@@ -44,21 +42,6 @@ install -c -m 644 hdparm.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 %{_mandir}/man8/hdparm.8*
 
 %changelog
-* Tue Nov 1 2022 liusirui <liusirui@huawei.com> 9.65-1
-- upgrade to 9.65
-
-* Thu Oct 20 2022 liusirui <liusirui@huawei.com> 9.62-4
-- add GPLv2 to correct license
-
-* Tue Mar 01 2022 Zhiqiang Liu <liuzhiqiang26@huawei.com> 9.62-3
-- fix fd leak in sysfs_write_attr()
-
-* Sat Jan 22 2022 volcanodragon <linfeilong@huawei.com> 9.62-2
-- delete passwd print for security
-
-* Tue Nov 23 2021 Li Jinlin <lijinlin3@huawei.com> 9.62-1
-- upgrade package to 9.62
-
 * Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 9.58-2
 - DESC: delete -S git from %autosetup, and delete BuildRequires git