hdparm: Update to version 9.65

Message ID 20230105182110.3725538-3-adolf.belka@ipfire.org
State Accepted
Commit 0d82593f67e33468c02bcfe0fbca5a26d79cc6ef
Headers
Series hdparm: Update to version 9.65 |

Commit Message

Adolf Belka Jan. 5, 2023, 6:21 p.m. UTC
  - Update from version 9.64 to 9.65
- Update of rootfile not required
- fix glibc headers patch updated for hdparm-9.65
- Changelog
    hdparm-9.65:
	- Another --Istdin fix: cannot read log pages when no device specified

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 lfs/hdparm                                               | 8 ++++----
 ...headers.patch => hdparm-9.65-fix-glibc-headers.patch} | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)
 rename src/patches/{hdparm-9.64-fix-glibc-headers.patch => hdparm-9.65-fix-glibc-headers.patch} (51%)
  

Patch

diff --git a/lfs/hdparm b/lfs/hdparm
index 8d3f6d1cf..7d859bf24 100644
--- a/lfs/hdparm
+++ b/lfs/hdparm
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 9.64
+VER        = 9.65
 
 THISAPP    = hdparm-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 0196f3ccec4005c542b834d8426cc6f64694783da3d4a064e898e25d17aab3aa0d9621276607169f2104c9a9804f9020554d836ded9efb16367a8ac4c9c9b146
+$(DL_FILE)_BLAKE2 = 79b1c16e7807f82a992ed7f22faef57045c56da4a281fbd8db3b8846b193ccc4b42329fa6abbebf8b652fbefb13aa0f18dfa726e802e8e1a45c94f414fb303b9
 
 install : $(TARGET)
 
@@ -70,7 +70,7 @@  $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hdparm-9.64-fix-glibc-headers.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hdparm-9.65-fix-glibc-headers.patch
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/src/patches/hdparm-9.64-fix-glibc-headers.patch b/src/patches/hdparm-9.65-fix-glibc-headers.patch
similarity index 51%
rename from src/patches/hdparm-9.64-fix-glibc-headers.patch
rename to src/patches/hdparm-9.65-fix-glibc-headers.patch
index 7589c861e..e26817086 100644
--- a/src/patches/hdparm-9.64-fix-glibc-headers.patch
+++ b/src/patches/hdparm-9.65-fix-glibc-headers.patch
@@ -1,11 +1,14 @@ 
---- hdparm-9.64/hdparm.c
-+++ hdparm-9.64/hdparm.c
-@@ -24,9 +24,6 @@
+--- hdparm-9.65/hdparm.c.orig	2022-09-06 19:02:56.000000000 +0200
++++ hdparm-9.65/hdparm.c	2023-01-05 15:33:04.487033604 +0100
+@@ -24,11 +24,6 @@
  #include <sys/mount.h>
  #include <sys/mman.h>
  #include <sys/user.h>
 -#include <linux/types.h>
+-#ifndef FSCONFIG_SET_FLAG
 -#include <linux/fs.h>
+-#endif
 -#include <linux/major.h>
  #include <endian.h>
  #include <asm/byteorder.h>
+