From: Yegor Yefremov <redacted>
Date: Wed, 29 Nov 2023 14:42:16 +0000 (+0100)
Subject: libs/xmlrpc-c: fix xmlrpc-c-abyss and xmlrpc-c-server-abyss packages
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f0cf2e75c3b4c5710a9f12426bd7284d3cdf624e;p=openwrt-packages.git

libs/xmlrpc-c: fix xmlrpc-c-abyss and xmlrpc-c-server-abyss packages

When building abyss feature, the following error occurs:

xmlrpc_server_abyss.c:783:13: warning: format not a string literal and
no format arguments [-Wformat-security]
783 | xmlrpc_faultf(envP, error);

Add a patch fixing the format parameter.

Signed-off-by: Yegor Yefremov <redacted>
---

diff --git a/libs/xmlrpc-c/Makefile b/libs/xmlrpc-c/Makefile
index 05cad3d43..13e77fc7e 100644
--- a/libs/xmlrpc-c/Makefile
+++ b/libs/xmlrpc-c/Makefile
@@ -76,7 +76,7 @@ endef
 define Package/xmlrpc-c-abyss
   $(call Package/xmlrpc-c/Default)
   TITLE+= - abyss
-  DEPENDS:=+xmlrpc-c-common @BROKEN
+  DEPENDS:=+xmlrpc-c-common
 endef
 
 define Package/xmlrpc-c-server-abyss
@@ -101,11 +101,10 @@ Package/xmlrpc-c-internal/description += Uses internal expat variant (stripped d
 CONFIGURE_ARGS+= \
 	--disable-wininet-client \
 	--disable-libwww-client \
-	--disable-abyss-server \
 	--disable-cgi-server \
 	--disable-cplusplus \
-	--disable-abyss-threads \
-	--without-libwww-ssl
+	--without-libwww-ssl \
+	--disable-abyss-openssl
 
 ifeq ($(BUILD_VARIANT),libxml2)
 	CONFIGURE_ARGS += \
@@ -217,6 +216,6 @@ $(eval $(call BuildPackage,xmlrpc-c-common))
 #$(eval $(call BuildPackage,xmlrpc-c-libxml2))
 $(eval $(call BuildPackage,xmlrpc-c-internal))
 $(eval $(call BuildPackage,xmlrpc-c-server))
-#$(eval $(call BuildPackage,xmlrpc-c-abyss))
-#$(eval $(call BuildPackage,xmlrpc-c-server-abyss))
+$(eval $(call BuildPackage,xmlrpc-c-abyss))
+$(eval $(call BuildPackage,xmlrpc-c-server-abyss))
 $(eval $(call BuildPackage,xmlrpc-c-client))
diff --git a/libs/xmlrpc-c/patches/001-fix-format-parameter.patch b/libs/xmlrpc-c/patches/001-fix-format-parameter.patch
new file mode 100644
index 000000000..2986a965a
--- /dev/null
+++ b/libs/xmlrpc-c/patches/001-fix-format-parameter.patch
@@ -0,0 +1,11 @@
+--- a/src/xmlrpc_server_abyss.c
++++ b/src/xmlrpc_server_abyss.c
+@@ -780,7 +780,7 @@ createServer(xmlrpc_env *
+         ServerInit2(abyssServerP, &error);
+ 
+         if (error) {
+-            xmlrpc_faultf(envP, error);
++            xmlrpc_faultf(envP, "%s", error);
+             xmlrpc_strfree(error);
+         }
+     }