diff options
| -rw-r--r-- | package/freerdp/Config.in | 6 | ||||
| -rw-r--r-- | package/freerdp/freerdp.mk | 23 |
2 files changed, 20 insertions, 9 deletions
diff --git a/package/freerdp/Config.in b/package/freerdp/Config.in index 47fd8be772..1c203c7a4b 100644 --- a/package/freerdp/Config.in +++ b/package/freerdp/Config.in @@ -10,6 +10,12 @@ config BR2_PACKAGE_FREERDP http://www.freerdp.com/ + Note: this also installs a key and certificate in + /etc/freerdp/keys/ . These are publicly-known, as they + are present in FreeRDP's source tree. It is strongly + suggested that you overwrite them with your own set, + either in an overlay rootfs or in a post-build script. + if BR2_PACKAGE_FREERDP config BR2_PACKAGE_FREERDP_SERVER diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 50b8f18432..f73bdd7770 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -71,15 +71,6 @@ endif ifeq ($(BR2_PACKAGE_FREERDP_SERVER),y) FREERDP_CONF_OPTS += -DWITH_SERVER=ON -DWITH_SERVER_INTERFACE=ON -# Install the server key and certificate, so that a client can connect. -# A user can override them with its own in a post-build script, if needed. -define FREERDP_INSTALL_KEYS - $(INSTALL) -D $(@D)/server/X11/server.key \ - $(TARGET_DIR)/etc/freerdp/keys/server.key - $(INSTALL) -D $(@D)/server/X11/server.crt \ - $(TARGET_DIR)/etc/freerdp/keys/server.crt -endef -FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_INSTALL_KEYS else FREERDP_CONF_OPTS += -DWITH_SERVER=OFF -DWITH_SERVER_INTERFACE=OFF endif @@ -178,4 +169,18 @@ FREERDP_CONF_OPTS += -DWITH_X11=OFF endif # ! SERVER && ! CLIENT +# Install the server key and certificate, so that a client can connect. +# A user can override them with its own in a post-build script, if needed. +# We install them even if the server is not enabled, since another server +# can be built and linked with libfreerdp (e.g. weston with the RDP +# backend). Key and cert are installed world-readable, so non-root users +# can start a server. +define FREERDP_INSTALL_KEYS + $(INSTALL) -m 0644 -D $(@D)/server/X11/server.key \ + $(TARGET_DIR)/etc/freerdp/keys/server.key + $(INSTALL) -m 0644 -D $(@D)/server/X11/server.crt \ + $(TARGET_DIR)/etc/freerdp/keys/server.crt +endef +FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_INSTALL_KEYS + $(eval $(cmake-package)) |
