- fix build with semanage and no other embedded interpreters

diff --git a/rpm-semanage.patch b/rpm-semanage.patch
new file mode 100644 (file)
index 0000000..06672d2
--- /dev/null
+++ b/rpm-semanage.patch
@@ -0,0 +1,29 @@
+--- rpm-5.4.15/rpmio/macro.c.orig      2017-02-20 18:33:02.615449768 +0100
++++ rpm-5.4.15/rpmio/macro.c   2017-02-20 19:38:27.348738287 +0100
+@@ -102,7 +102,7 @@
+ #include "debug.h"
+ 
+ /*@unchecked@*/
+-#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
++#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) || defined(WITH_SEMANAGE)
+ static int _globalI = 0x80000000;
+ #endif
+ 
+@@ -866,6 +866,8 @@
+     return se;
+ }
+ 
++void delMacroAll(MacroContext mc, const char * n);
++
+ /**
+  * Parse (and execute) macro undefinition.
+  * @param mc          macro context
+@@ -1643,7 +1645,7 @@
+  * @retval *avp               invocation args
+  * @return            script string
+  */
+-#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_JNIEMBED) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_MRUBY_EMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
++#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_JNIEMBED) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_MRUBY_EMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) || defined(WITH_SEMANAGE)
+ static char _FIXME_embedded_interpreter_eval_returned_null[] =
+     "FIXME: embedded interpreter eval returned null.";
+ static char * parseEmbedded(const char * s, size_t nb, char *** avp)

diff --git a/rpm.spec b/rpm.spec
index 2e537c1e93c8dc3457ac668060cd9abbf3b21f59..086e21360cb1c73f9376162c76dd6f6e3cbf7e3e 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -118,6 +118,7 @@ Patch22:    %{name}-sparc64.patch
 Patch23:       %{name}-gendiff.patch
 Patch24:       openmp.patch
 Patch25:       %{name}-URPM-build-fix.patch
 Patch23:       %{name}-gendiff.patch
 Patch24:       openmp.patch
 Patch25:       %{name}-URPM-build-fix.patch

+Patch26:       %{name}-semanage.patch

 Patch27:       %{name}-helperEVR-noassert.patch
 Patch28:       %{name}-unglobal.patch
 Patch29:       %{name}-builddir-readlink.patch
 Patch27:       %{name}-helperEVR-noassert.patch
 Patch28:       %{name}-unglobal.patch
 Patch29:       %{name}-builddir-readlink.patch


@@ -910,6 +911,7 @@ cd -
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1

+%patch26 -p1

 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1