[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 3f39c825bce8710203e89420b41b1660ddf3857b..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.6p1
-PKG_RELEASE:=2
+PKG_VERSION:=5.8p1
+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:=e6ee52e47c768bf0ec42a232b5d18fb0
+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,12 +46,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 +56,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 +65,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 +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
@@ -97,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
@@ -110,7 +98,6 @@ OpenSSH SFTP server.
 endef
 
 CONFIGURE_ARGS+= \
-       $(DISABLE_LARGEFILE) \
        $(DISABLE_NLS) \
        --sysconfdir=/etc/ssh \
        --enable-shared \
@@ -182,24 +169,6 @@ define Package/openssh-server/postinst
 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