From: Peter Wagner <​tripolar@gmx.at>
Date: Thu, 22 Sep 2011 09:36:06 +0000 (+0000)
Subject: [packages] openssh: use seperate package for moduli file that depends on
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a5d96cdef2887866390f57d23146e28e22d2adc2;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] openssh: use seperate package for moduli file that depends on
openssh-server as the server also works without the moduli file


SVN-Revision: 28287
---

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index a39eb1876e..334b3074ad 100644
--- 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))