X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fopenssh%2FMakefile;h=606638a88202ffb63be02d3c9139b52cd6870ecf;hp=3d1539c566910ba5659387093fb435a8392c27dc;hb=d7e6257a68a68fe88f0b8c6b64068fcf8a10cb76;hpb=429205ff6e17a340a85c420d73aa5678ede426d6 diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 3d1539c566..606638a882 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -1,5 +1,5 @@ -# -# 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. @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh -PKG_VERSION:=4.2p1 -PKG_RELEASE:=2 +PKG_VERSION:=4.7p1 +PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -18,11 +18,11 @@ 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 +PKG_MD5SUM:=50a800fd2c6def9e9a53068837e87b91 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -PKG_BUILDDEP:=libopenssl + +PKG_BUILD_DEPENDS:=libopenssl include $(INCLUDE_DIR)/package.mk @@ -31,8 +31,12 @@ define Package/openssh-client CATEGORY:=Network DEPENDS:=+libopenssl +zlib TITLE:=OpenSSH client - DESCRIPTION:=OpenSSH client. URL:=http://www.openssh.com/ + SUBMENU:=ssh +endef + +define Package/openssh-client/description +OpenSSH client. endef define Package/openssh-client/conffiles @@ -44,8 +48,12 @@ define Package/openssh-client-utils CATEGORY:=Network DEPENDS:=openssh-client TITLE:=OpenSSH client utilities - DESCRIPTION:=OpenSSH client utilities. URL:=http://www.openssh.com/ + SUBMENU:=ssh +endef + +define Package/openssh-client-utils/description +OpenSSH client utilities. endef define Package/openssh-server @@ -53,8 +61,12 @@ define Package/openssh-server CATEGORY:=Network DEPENDS:=+libopenssl +zlib 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,17 +78,25 @@ 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 Package/openssh-sftp-server/description +OpenSSH SFTP server. endef define Build/Configure @@ -126,48 +146,90 @@ endef 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)" \ 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-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/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 + +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 + +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