[openssh-client-utils] dont add libgcc two times

[openwrt/svn-archive/archive.git] / net / openssh / Makefile

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 84bca8b8dbd6923f21387299480402105917db8f..57fe655947e2b49a2ffec5543170c94d6cd3ac55 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -8,30 +8,35 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
-PKG_VERSION:=5.2p1
+PKG_VERSION:=5.8p1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 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:=ada79c7328a8551bdf55c95e631e7dad
+PKG_MD5SUM:=86f5e1c23b4c4845f23b9b7b493fb53d
 
 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 +libgcc
+  TITLE:=OpenSSH
+  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
   URL:=http://www.openssh.com/
   SUBMENU:=SSH
 endef
 
+define Package/openssh-client
+  $(call Package/openssh/Default)
+  TITLE+= client
+endef
+
 define Package/openssh-client/description
 OpenSSH client.
 endef
@@ -41,25 +46,28 @@ define Package/openssh-client/conffiles
 endef
 
 define Package/openssh-client-utils
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=openssh-client
-  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
 OpenSSH client utilities.
 endef
 
+define Package/openssh-keygen
+  $(call Package/openssh/Default)
+  TITLE+= keygen
+endef
+
+define Package/openssh-keygen/description
+OpenSSH keygen.
+endef
+
 define Package/openssh-server
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libopenssl +zlib
-  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
@@ -71,12 +79,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
@@ -84,12 +88,9 @@ 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)
+  DEPENDS:=+libgcc
+  TITLE+= SFTP server
 endef
 
 define Package/openssh-sftp-server/description
@@ -97,7 +98,6 @@ OpenSSH SFTP server.
 endef
 
 CONFIGURE_ARGS+= \
-       $(DISABLE_LARGEFILE) \
        $(DISABLE_NLS) \
        --sysconfdir=/etc/ssh \
        --enable-shared \
@@ -123,8 +123,6 @@ endif
 CONFIGURE_VARS += LD="$(TARGET_CC)"
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                LIBS="" \
@@ -149,14 +147,18 @@ define Package/openssh-client-utils/install
        $(INSTALL_BIN) $(foreach bin,add agent keyscan keysign,$(PKG_BUILD_DIR)/ssh-$(bin)) $(1)/usr/bin/
 endef
 
+define Package/openssh-keygen/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/
+endef
+
+
 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/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/sshd.init $(1)/etc/init.d/sshd
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/
 endef
@@ -165,32 +167,14 @@ define Package/openssh-server/postinst
 #!/bin/sh
 
 name=sshd
-id=99
-
-# 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
+id=22
 
-echo ""
-if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then 
+if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then
        echo "adding group $$name to /etc/group"
-       echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group  
+       echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group
 fi
 
-if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then 
+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
@@ -215,6 +199,7 @@ endef
 
 $(eval $(call BuildPackage,openssh-client))
 $(eval $(call BuildPackage,openssh-client-utils))
+$(eval $(call BuildPackage,openssh-keygen))
 $(eval $(call BuildPackage,openssh-server))
 $(eval $(call BuildPackage,openssh-sftp-client))
 $(eval $(call BuildPackage,openssh-sftp-server))