From: Felix Fietkau <nbd@nbd.name>
Date: Sat, 21 May 2016 10:42:44 +0000 (+0200)
Subject: uhttpd: use configured distribution name for SSL certificate CN
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b570c0c88e8a020d9e21e556cf05cb3a702fff4d;p=openwrt%2Fstaging%2Fkaloz.git

uhttpd: use configured distribution name for SSL certificate CN

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
index da5572b5fe..ab5ef64bb5 100644
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -23,6 +23,7 @@ PKG_BUILD_DEPENDS = ustream-ssl
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
+include $(INCLUDE_DIR)/version.mk
 
 define Package/uhttpd/default
   SECTION:=net
@@ -124,6 +125,7 @@ define Package/uhttpd/install
 	$(INSTALL_BIN) ./files/uhttpd.init $(1)/etc/init.d/uhttpd
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./files/uhttpd.config $(1)/etc/config/uhttpd
+	$(VERSION_SED_SCRIPT) $(1)/etc/config/uhttpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd $(1)/usr/sbin/uhttpd
 endef
diff --git a/package/network/services/uhttpd/files/uhttpd.config b/package/network/services/uhttpd/files/uhttpd.config
index f8df4cdecb..db57095d12 100644
--- a/package/network/services/uhttpd/files/uhttpd.config
+++ b/package/network/services/uhttpd/files/uhttpd.config
@@ -119,4 +119,4 @@ config cert px5g
 	option location		Unknown
 
 	# Common name
-	option commonname	Lede
+	option commonname	'%D'