[packages] openssh: update to 6.2p2

[packages.git] / net / openssh / Makefile

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 0b0d83d..3118655 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006,2008 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,30 +8,46 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
-PKG_VERSION:=5.5p1
-PKG_RELEASE:=2
+PKG_VERSION:=6.2p2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
                ftp://openbsd.wiretapped.net/pub/OpenBSD/OpenSSH/portable/ \
                ftp://ftp.belnet.be/packages/openbsd/OpenSSH/portable/ \
                ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/
-PKG_MD5SUM:=88633408f4cb1eb11ec7e2ec58b519eb
+PKG_MD5SUM:=be46174dcbb77ebb4ea88ef140685de1
 
 PKG_BUILD_DEPENDS:=libopenssl
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/openssh-client
+define Package/openssh/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libopenssl +zlib
-  TITLE:=OpenSSH client
+  DEPENDS:=+libopenssl +zlib +SSP_SUPPORT:libssp
+  TITLE:=OpenSSH
   MAINTAINER:=Peter Wagner <tripolar@gmx.at>
   URL:=http://www.openssh.com/
   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
+endef
+
 define Package/openssh-client/description
 OpenSSH client.
 endef
@@ -41,12 +57,9 @@ define Package/openssh-client/conffiles
 endef
 
 define Package/openssh-client-utils
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+openssh-client +openssh-keygen
-  TITLE:=OpenSSH client utilities
-  URL:=http://www.openssh.com/
-  SUBMENU:=SSH
+  $(call Package/openssh/Default)
+  DEPENDS+= +openssh-client +openssh-keygen
+  TITLE+= client utilities
 endef
 
 define Package/openssh-client-utils/description
@@ -54,12 +67,8 @@ OpenSSH client utilities.
 endef
 
 define Package/openssh-keygen
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libopenssl +zlib
-  TITLE:=OpenSSH keygen
-  URL:=http://www.openssh.com/
-  SUBMENU:=SSH
+  $(call Package/openssh/Default)
+  TITLE+= keygen
 endef
 
 define Package/openssh-keygen/description
@@ -67,12 +76,9 @@ OpenSSH keygen.
 endef
 
 define Package/openssh-server
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libopenssl +zlib +openssh-keygen
-  TITLE:=OpenSSH server
-  URL:=http://www.openssh.com/
-  SUBMENU:=SSH
+  $(call Package/openssh/Default)
+  DEPENDS+= +openssh-keygen
+  TITLE+= server
 endef
 
 define Package/openssh-server/description
@@ -84,12 +90,8 @@ define Package/openssh-server/conffiles
 endef
 
 define Package/openssh-sftp-client
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libopenssl +zlib
-  TITLE:=OpenSSH SFTP client
-  URL:=http://www.openssh.com/
-  SUBMENU:=SSH
+  $(call Package/openssh/Default)
+  TITLE+= SFTP client
 endef
 
 define Package/openssh-sftp-client/description
@@ -97,12 +99,8 @@ OpenSSH SFTP client.
 endef
 
 define Package/openssh-sftp-server
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=
-  TITLE:=OpenSSH SFTP server
-  URL:=http://www.openssh.com/
-  SUBMENU:=SSH
+  $(call Package/openssh/Default)
+  TITLE+= SFTP server
 endef
 
 define Package/openssh-sftp-server/description
@@ -110,9 +108,10 @@ OpenSSH SFTP server.
 endef
 
 CONFIGURE_ARGS+= \
-       $(DISABLE_LARGEFILE) \
        $(DISABLE_NLS) \
        --sysconfdir=/etc/ssh \
+       --with-privsep-user=sshd \
+       --with-privsep-path=/var/empty \
        --enable-shared \
        --disable-static \
        --disable-debug \
@@ -128,6 +127,11 @@ CONFIGURE_ARGS+= \
        --without-pam \
        --without-x
 
+ifeq ($(CONFIG_OPENSSL_ENGINE),y)
+CONFIGURE_ARGS+= \
+       --with-ssl-engine
+endif
+
 ifneq ($(CONFIG_SSP_SUPPORT),y)
 CONFIGURE_ARGS += \
        --without-stackprotect
@@ -146,6 +150,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
@@ -176,46 +185,6 @@ define Package/openssh-server/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/
 endef
 
-define Package/openssh-server/postinst
-#!/bin/sh
-
-name=sshd
-id=22
-
-# do not change below
-# check if we are on real system
-if [ -z "$${IPKG_INSTROOT}" ]; then
-       # create copies of passwd and group, if we use squashfs
-       rootfs=`mount |awk '/root/ { print $$5 }'`
-       if [ "$$rootfs" = "squashfs" ]; then
-               if [ -h /etc/group ]; then
-                       rm /etc/group
-                       cp /rom/etc/group /etc/group
-               fi
-               if [ -h /etc/passwd ]; then
-                       rm /etc/passwd
-                       cp /rom/etc/passwd /etc/passwd
-               fi
-       fi
-fi
-
-echo ""
-if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then
-       echo "adding group $$name to /etc/group"
-       echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group
-fi
-
-if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then
-       echo "adding user $$name to /etc/passwd"
-       echo "$${name}:x:$${id}:$${id}:$${name}:/var/empty/.$${name}:/bin/false" >> $${IPKG_INSTROOT}/etc/passwd
-fi
-
-grep -q '^ssh[[:space:]]*22/tcp' $${IPKG_INSTROOT}/etc/services 2>/dev/null
-if [ $$? -ne 0 ]; then
-echo "ssh           22/tcp" >>$${IPKG_INSTROOT}/etc/services
-fi
-endef
-
 define Package/openssh-sftp-client/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sftp $(1)/usr/bin/
@@ -229,6 +198,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))