X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fopenssh%2FMakefile;h=0ac1e3bc9bdd9850b2fdbb7fc2ec02fda0e86112;hp=4e193342562bcf9205f18fc8e464dc79388c4fab;hb=3389af8a5778bbabdb0c91a32f1e6a465c79a0b4;hpb=c36aad7d20cb6c8b7589a09bbcd61454506dd1e6

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 4e19334256..0ac1e3bc9b 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -1,28 +1,24 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006,2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
-PKG_VERSION:=4.2p1
-PKG_RELEASE:=2
+PKG_VERSION:=5.6p1
+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:=df899194a340c933944b193477c628fa
-PKG_CAT:=zcat
+		ftp://ftp.belnet.be/packages/openbsd/OpenSSH/portable/ \
+		ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/
+PKG_MD5SUM:=e6ee52e47c768bf0ec42a232b5d18fb0
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_BUILDDEP:=openssl
+PKG_BUILD_DEPENDS:=libopenssl
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -31,8 +27,13 @@ define Package/openssh-client
   CATEGORY:=Network
   DEPENDS:=+libopenssl +zlib
   TITLE:=OpenSSH client
-  DESCRIPTION:=OpenSSH client.
+  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
   URL:=http://www.openssh.com/
+  SUBMENU:=SSH
+endef
+
+define Package/openssh-client/description
+OpenSSH client.
 endef
 
 define Package/openssh-client/conffiles
@@ -42,19 +43,40 @@ endef
 define Package/openssh-client-utils
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=openssh-client
+  DEPENDS:=+openssh-client +openssh-keygen
   TITLE:=OpenSSH client utilities
-  DESCRIPTION:=OpenSSH client utilities.
   URL:=http://www.openssh.com/
+  SUBMENU:=SSH
 endef
 
-define Package/openssh-server
+define Package/openssh-client-utils/description
+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
+endef
+
+define Package/openssh-keygen/description
+OpenSSH keygen.
+endef
+
+define Package/openssh-server
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libopenssl +zlib +openssh-keygen
   TITLE:=OpenSSH server
-  DESCRIPTION:=OpenSSH server.
   URL:=http://www.openssh.com/
+  SUBMENU:=SSH
+endef
+
+define Package/openssh-server/description
+OpenSSH server.
 endef
 
 define Package/openssh-server/conffiles
@@ -66,113 +88,149 @@ define Package/openssh-sftp-client
   CATEGORY:=Network
   DEPENDS:=+libopenssl +zlib
   TITLE:=OpenSSH SFTP client
-  DESCRIPTION:=OpenSSH SFTP client.
   URL:=http://www.openssh.com/
+  SUBMENU:=SSH
+endef
+
+define Package/openssh-sftp-client/description
+OpenSSH SFTP client.
 endef
 
 define Package/openssh-sftp-server
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libopenssl +zlib
+  DEPENDS:=
   TITLE:=OpenSSH SFTP server
-  DESCRIPTION:=OpenSSH SFTP server.
   URL:=http://www.openssh.com/
+  SUBMENU:=SSH
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LD="$(TARGET_CC)" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc/ssh \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--enable-shared \
-			--disable-static \
-			--disable-debug \
-			--disable-strip \
-			--disable-etc-default-login \
-			--disable-lastlog \
-			--disable-utmp \
-			--disable-utmpx \
-			--disable-wtmp \
-			--disable-wtmpx \
-			--without-bsd-auth \
-			--without-kerberos5 \
-			--without-pam \
-			--without-x \
-	);
+define Package/openssh-sftp-server/description
+OpenSSH SFTP server.
 endef
 
+CONFIGURE_ARGS+= \
+	$(DISABLE_LARGEFILE) \
+	$(DISABLE_NLS) \
+	--sysconfdir=/etc/ssh \
+	--enable-shared \
+	--disable-static \
+	--disable-debug \
+	--disable-strip \
+	--disable-etc-default-login \
+	--disable-lastlog \
+	--disable-utmp \
+	--disable-utmpx \
+	--disable-wtmp \
+	--disable-wtmpx \
+	--without-bsd-auth \
+	--without-kerberos5 \
+	--without-pam \
+	--without-x
+
+ifneq ($(CONFIG_SSP_SUPPORT),y)
+CONFIGURE_ARGS += \
+	--without-stackprotect
+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="" \
+		sftp-server
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		STRIP_OPT="" \
 		all install
 endef
 
 define Package/openssh-client/install
-	install -m0755 -d $(1)/etc/ssh
+	$(INSTALL_DIR) $(1)/etc/ssh
 	chmod 0700 $(1)/etc/ssh
 	$(CP) $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(1)/etc/ssh/
-	install -m0755 -d $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/bin/
 endef
 
 define Package/openssh-client-utils/install
-	install -m0755 -d $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-add $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-agent $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keyscan $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(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 -m0755 -d $(1)/etc/ssh
+	$(INSTALL_DIR) $(1)/etc/ssh
 	chmod 0700 $(1)/etc/ssh
 	$(CP) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(1)/etc/ssh/
-	install -m0755 -d $(1)/etc/init.d
-	install -m0755 ./files/S50sshd $(1)/etc/init.d/
-	install -m0755 -d $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/
-	install -m0755 -d $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/sshd.init $(1)/etc/init.d/sshd
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(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 -m0755 -d $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/sftp $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sftp $(1)/usr/bin/
 endef
 
 define Package/openssh-sftp-server/install
-	install -m0755 -d $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sftp-server $(1)/usr/lib/
-	install -m0755 -d $(1)/usr/libexec
+	$(INSTALL_DIR) $(1)/usr/libexec
 	ln -sf ../lib/sftp-server $(1)/usr/libexec/sftp-server
 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))