[packages] openssh: use seperate package for moduli file that depends on

openssh-server as the server also works without the moduli file

git-svn-id: svn://svn.openwrt.org/openwrt/packages@28287 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index a39eb18..334b307 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -32,6 +32,17 @@ define Package/openssh/Default
   SUBMENU:=SSH
 endef
 
+define Package/openssh-moduli
+  $(call Package/openssh/Default)
+  DEPENDS+= +openssh-server
+  TITLE+= moduli file
+endef
+
+define Package/openssh-moduli/description
+OpenSSH server moduli file.
+endef
+
+
 define Package/openssh-client
   $(call Package/openssh/Default)
   TITLE+= client
@@ -133,6 +144,11 @@ define Build/Compile
                all install
 endef
 
+define Package/openssh-moduli/install
+       $(INSTALL_DIR) $(1)/etc/ssh
+       $(CP) $(PKG_INSTALL_DIR)/etc/ssh/moduli $(1)/etc/ssh/
+endef
+
 define Package/openssh-client/install
        $(INSTALL_DIR) $(1)/etc/ssh
        chmod 0700 $(1)/etc/ssh
@@ -194,6 +210,7 @@ define Package/openssh-sftp-server/install
 endef
 
 $(eval $(call BuildPackage,openssh-client))
+$(eval $(call BuildPackage,openssh-moduli))
 $(eval $(call BuildPackage,openssh-client-utils))
 $(eval $(call BuildPackage,openssh-keygen))
 $(eval $(call BuildPackage,openssh-server))