[packages/hfsplus-tools] - sys/sysctl.h is gone in glibc 2.34, rel 5

[baggins]

commit 1981f98cc44b29dba8da922b35505ef4659d18f6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Sep 26 09:45:00 2021 +0200

    - sys/sysctl.h is gone in glibc 2.34, rel 5

 x32.patch => glibc-2.34.patch | 24 ++++++++----------------
 hfsplus-tools.spec            |  4 ++--
 2 files changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/hfsplus-tools.spec b/hfsplus-tools.spec
index ad4342e..d8a8717 100644
--- a/hfsplus-tools.spec
+++ b/hfsplus-tools.spec
@@ -2,12 +2,12 @@ Summary:	Tools to create/check Apple HFS+ filesystems
 Summary(pl.UTF-8):	Narzędzia do tworzenia i sprawdzania systemów plików Apple HFS+
 Name:		hfsplus-tools
 Version:	540.1.linux3
-Release:	4
+Release:	5
 License:	APSL 2.0
 Group:		Base
 Source0:	http://cavan.codon.org.uk/~mjg59/diskdev_cmds/diskdev_cmds-%{version}.tar.gz
 # Source0-md5:	0435afc389b919027b69616ad1b05709
-Patch0:		x32.patch
+Patch0:		glibc-2.34.patch
 URL:		http://gentoo-wiki.com/HOWTO_hfsplus
 # note: it uses Clang "Blocks" extension
 BuildRequires:	clang
diff --git a/x32.patch b/glibc-2.34.patch
similarity index 80%
rename from x32.patch
rename to glibc-2.34.patch
index 6549dfd..892f8a3 100644
--- a/x32.patch
+++ b/glibc-2.34.patch
@@ -1,48 +1,40 @@
 --- diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c~	2012-02-02 23:36:59.000000000 +0100
 +++ diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c	2018-10-23 00:01:04.652419886 +0200
-@@ -38,7 +38,9 @@
+@@ -38,7 +38,6 @@
  #endif
  #include <sys/errno.h>
  #include <sys/stat.h>
-+#ifndef __ILP32__
- #include <sys/sysctl.h>
-+#endif
+-#include <sys/sysctl.h>
  #if !LINUX
  #include <sys/vmmeter.h>
  #endif
 --- diskdev_cmds-540.1.linux3/fsck_hfs.tproj/fsck_hfs.c~	2012-02-16 20:59:54.000000000 +0100
 +++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/fsck_hfs.c	2018-10-23 00:01:35.625938707 +0200
-@@ -30,7 +30,9 @@
+@@ -30,7 +30,6 @@
  #include <sys/ioctl.h>
  #if !LINUX
  #include <sys/disk.h>
-+#ifndef __ILP32__
- #include <sys/sysctl.h>
-+#endif
+-#include <sys/sysctl.h>
  #include <setjmp.h>
  #endif
  #include <hfs/hfs_mount.h>
 --- diskdev_cmds-540.1.linux3/fsck_hfs.tproj/utilities.c~	2012-02-01 18:17:19.000000000 +0100
 +++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/utilities.c	2018-10-23 00:02:03.069484085 +0200
-@@ -70,7 +70,9 @@
+@@ -70,7 +70,6 @@
  #include <string.h>
  #include <unistd.h> 
  #include <stdlib.h>
-+#ifndef __ILP32__
- #include <sys/sysctl.h>
-+#endif
+-#include <sys/sysctl.h>
  
  #include "fsck_hfs.h"
  
 --- diskdev_cmds-540.1.linux3/fsck_hfs.tproj/dfalib/Scavenger.h~	2012-02-01 18:17:19.000000000 +0100
 +++ diskdev_cmds-540.1.linux3/fsck_hfs.tproj/dfalib/Scavenger.h	2018-10-23 00:02:23.689671397 +0200
-@@ -48,7 +48,9 @@
+@@ -48,7 +48,6 @@
  #endif
  #include <sys/errno.h>
  #include <sys/param.h>
-+#ifndef __ILP32__
- #include <sys/sysctl.h>
-+#endif
+-#include <sys/sysctl.h>
  #include <sys/mount.h>
  #include <hfs/hfs_mount.h>
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hfsplus-tools.git/commitdiff/1981f98cc44b29dba8da922b35505ef4659d18f6