From 2d655108ba848d7a7a5ef2ea7c582e0ee9fca8fb Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Apr 19 2024 00:08:52 +0000
Subject: Avoid infinite include loop when using libbsd-overlay (#2275197)


---

diff --git a/libbsd-cdefs.h b/libbsd-cdefs.h
index 8237174..9d38af9 100644
--- a/libbsd-cdefs.h
+++ b/libbsd-cdefs.h
@@ -1,9 +1,17 @@
 #include <bits/wordsize.h>
 
 #if __WORDSIZE == 32
-#include "cdefs-32.h"
+# ifdef LIBBSD_OVERLAY
+#  include "sys/cdefs-32.h"
+# else
+#  include "cdefs-32.h"
+# endif
 #elif __WORDSIZE == 64
-#include "cdefs-64.h"
+# ifdef LIBBSD_OVERLAY
+#  include "sys/cdefs-64.h"
+# else
+#  include "cdefs-64.h"
+# endif
 #else
-#error "Unknown word size"
+# error "Unknown word size"
 #endif
diff --git a/libbsd.spec b/libbsd.spec
index 1d3d4d7..ebc795e 100644
--- a/libbsd.spec
+++ b/libbsd.spec
@@ -1,6 +1,6 @@
 Name:           libbsd
 Version:        0.12.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library providing BSD-compatible functions for portability
 URL:            https://libbsd.freedesktop.org/
 # Breakdown in COPYING file of libbsd release tarball, see also:
@@ -85,6 +85,9 @@ install -p -m 0644 %{SOURCE3} %{buildroot}%{_includedir}/bsd/sys/cdefs.h
 %{_libdir}/pkgconfig/%{name}-ctor.pc
 
 %changelog
+* Fri Apr 19 2024 Robert Scheck <robert@fedoraproject.org> - 0.12.2-3
+- Avoid infinite include loop when using libbsd-overlay (#2275197)
+
 * Fri Apr 12 2024 Robert Scheck <robert@fedoraproject.org> - 0.12.2-2
 - Avoid multilib conflict on /usr/include/bsd/sys/cdefs.h (#2273347)