From: Christian Marangi <ansuelsmth@gmail.com>
Date: Sun, 17 Nov 2024 18:09:31 +0000 (+0100)
Subject: include/package-pack: escape package description for APK mkpkg
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=43455f1075855d9ed2760f70b2d8acbe8e8bb16c;p=openwrt%2Fstaging%2Fwigyori.git

include/package-pack: escape package description for APK mkpkg

Escape special char for package description for APK mkpkg as the
description is passed as an args to mkpkg with --info option and can
easily escape from the "".

Currently escaped char `, $, ", \.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---

diff --git a/include/package-pack.mk b/include/package-pack.mk
index 9d06c8b647..830b39f8d7 100644
--- a/include/package-pack.mk
+++ b/include/package-pack.mk
@@ -8,6 +8,10 @@ endif
 
 IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
 
+define description_escape
+$(subst `,\`,$(subst $$,\$$,$(subst ",\",$(subst \,\\,$(1)))))
+endef
+
 # Generates a make statement to return a wildcard for candidate ipkg files
 # 1: package name
 define gen_package_wildcard
@@ -339,7 +343,7 @@ else
 	$(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk mkpkg \
 	  --info "name:$(1)$$(ABIV_$(1))" \
 	  --info "version:$(VERSION)" \
-	  --info "description:$$(strip $$(Package/$(1)/description))" \
+	  --info "description:$$(call description_escape,$$(strip $$(Package/$(1)/description)))" \
 	  --info "arch:$(PKGARCH)" \
 	  --info "license:$(LICENSE)" \
 	  --info "origin:$(SOURCE)" \