Fix build of the insserv generator

(cherry picked from commit 5a4ffa250571f55be55495caaa8c990045fee740)

diff --git a/debian/changelog b/debian/changelog
index eb7e9690f678152b0f16e0bad12b2569806c9d2c..15b50c47698fc087a88fa17141c6e2e282c16800 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ systemd (214-1) UNRELEASED; urgency=medium
     - Rebase remaining Debian patches on top of v214-stable.
     - Drop modifications to the now-removed built-in sysvinit support.
 
+  [ Sjoerd Simons ]
+  * debian/patches/shared-include-stdbool.h-in-mkdir.h.patch
+    + Added. Include stdbool before using bool in function prototypes. Fixes
+      build of the insserv generator
+
  -- Jon Severinsson <jon@severinsson.net>  Sun, 16 Jul 2014 20:00:00 +0200
 
 systemd (208-6) unstable; urgency=medium

diff --git a/debian/patches/series b/debian/patches/series
index a46bfedce64e36550fa422c0d6927c5da638cda2..d318207483f5bb7dcf77b9e4b4fc72813a6a30a6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -61,6 +61,7 @@ sysv-generator-fix-incorect-ordering-of-Wants.patch
 core-transaction-fix-cycle-break-attempts-outside-tr.patch
 units-conditionalize-static-device-node-logic-on-CAP.patch
 build-sys-don-t-move-libgudev-to-lib.patch
+shared-include-stdbool.h-in-mkdir.h.patch
 
 ## Debian specific patches:
 Add-back-support-for-Debian-specific-config-files.patch

diff --git a/debian/patches/shared-include-stdbool.h-in-mkdir.h.patch b/debian/patches/shared-include-stdbool.h-in-mkdir.h.patch
new file mode 100644 (file)
index 0000000..ddbe428
--- /dev/null
+++ b/debian/patches/shared-include-stdbool.h-in-mkdir.h.patch
@@ -0,0 +1,21 @@
+From: Sjoerd Simons <sjoerd@luon.net>
+Date: Wed, 16 Jul 2014 12:09:56 +0200
+Subject: shared: include stdbool.h in mkdir.h
+
+(cherry picked from commit 4e4877d96c8afd0818176a472080986bbf28ea3a)
+---
+ src/shared/mkdir.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/shared/mkdir.h b/src/shared/mkdir.h
+index d15ede6..dd5b41e 100644
+--- a/src/shared/mkdir.h
++++ b/src/shared/mkdir.h
+@@ -22,6 +22,7 @@
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
+ 
++#include <stdbool.h>
+ #include <sys/types.h>
+ 
+ int mkdir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid);