From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 20 Sep 2011 21:04:04 +0000 (+0000)
Subject: openssh: ship /etc/ssh/moduli with openssh-server
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=502f29f922d92fe2a6696c2822fe8dc531fe8f83;p=openwrt%2Fsvn-archive%2Fpackages.git

openssh: ship /etc/ssh/moduli with openssh-server

SVN-Revision: 28264
---

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 0c6aeea82..a39eb1876 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006,2008 OpenWrt.org
+# Copyright (C) 2006,2008-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
 PKG_VERSION:=5.8p2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -157,6 +157,7 @@ define Package/openssh-server/install
 	$(INSTALL_DIR) $(1)/etc/ssh
 	chmod 0700 $(1)/etc/ssh
 	$(CP) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(1)/etc/ssh/
+	$(CP) $(PKG_INSTALL_DIR)/etc/ssh/moduli $(1)/etc/ssh/
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/sshd.init $(1)/etc/init.d/sshd
 	$(INSTALL_DIR) $(1)/usr/sbin