disable sstrip, causes problems

[openwrt.git] / obsolete-buildroot / make / openssh.mk

diff --git a/obsolete-buildroot/make/openssh.mk b/obsolete-buildroot/make/openssh.mk
index c7feba2..0182f57 100644 (file)
--- a/obsolete-buildroot/make/openssh.mk
+++ b/obsolete-buildroot/make/openssh.mk
@@ -7,14 +7,22 @@
 OPENSSH_SITE:=ftp://ftp.tux.org/bsd/openbsd/OpenSSH/portable/
 OPENSSH_DIR:=$(BUILD_DIR)/openssh-3.8p1
 OPENSSH_SOURCE:=openssh-3.8p1.tar.gz
-OPENSSH_PATCH:=$(SOURCE_DIR)/openssh.patch
+
+OPENSSH_IPK_DIR=$(OPENWRT_IPK_DIR)/openssh
+OPENSSH_IPK_BUILD_DIR:=$(BUILD_DIR)/openssh-3.8p1-ipk
+
+OPENSSH_SERVER_IPK:=$(BUILD_DIR)/openssh-server_3.8p1-1_mipsel.ipk
+OPENSSH_CLIENT_IPK:=$(BUILD_DIR)/openssh-client_3.8p1-1_mipsel.ipk
+OPENSSH_SFTP_SERVER_IPK:=$(BUILD_DIR)/openssh-sftp-server_3.8p1-1_mipsel.ipk
+OPENSSH_SFTP_CLIENT_IPK:=$(BUILD_DIR)/openssh-sftp-client_3.8p1-1_mipsel.ipk
+OPENSSH_CLIENT_EX_IPK:=$(BUILD_DIR)/openssh-client-extras_3.8p1-1_mipsel.ipk
 
 $(DL_DIR)/$(OPENSSH_SOURCE):
        $(WGET) -P $(DL_DIR) $(OPENSSH_SITE)/$(OPENSSH_SOURCE)
 
 $(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE) $(OPENSSH_PATCH)
        zcat $(DL_DIR)/$(OPENSSH_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-       cat $(OPENSSH_PATCH) | patch -p1 -d $(OPENSSH_DIR)
+       cat $(OPENSSH_IPK_DIR)/openssh.patch | patch -p1 -d $(OPENSSH_DIR)
        touch  $(OPENSSH_DIR)/.unpacked
 
 $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked
@@ -65,9 +73,94 @@ $(TARGET_DIR)/usr/bin/ssh: $(OPENSSH_DIR)/ssh
        cp $(OPENSSH_DIR)/S50sshd $(TARGET_DIR)/etc/init.d/
        chmod a+x $(TARGET_DIR)/etc/init.d/S50sshd
        rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+       # since this is the embedded build, keep things to minimum
+       rm $(TARGET_DIR)/etc/moduli
+       rm $(TARGET_DIR)/usr/bin/sftp
+       rm $(TARGET_DIR)/usr/bin/ssh-add
+       rm $(TARGET_DIR)/usr/bin/ssh-agent
+       rm $(TARGET_DIR)/usr/bin/ssh-keyscan
+       rm $(TARGET_DIR)/usr/sbin/sftp-server
+       rm $(TARGET_DIR)/usr/sbin/ssh-keysign
 
 openssh: $(TARGET_DIR)/usr/bin/ssh
 
+$(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh: $(OPENSSH_DIR)/ssh
+       $(MAKE) CC=$(TARGET_CC) DESTDIR=$(OPENSSH_IPK_BUILD_DIR) -C $(OPENSSH_DIR) install
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/etc/init.d/
+       cp $(OPENSSH_DIR)/S50sshd $(OPENSSH_IPK_BUILD_DIR)/etc/init.d/
+       chmod a+x $(OPENSSH_IPK_BUILD_DIR)/etc/init.d/S50sshd
+       rm -rf $(OPENSSH_IPK_BUILD_DIR)/usr/info $(OPENSSH_IPK_BUILD_DIR)/usr/man $(OPENSSH_IPK_BUILD_DIR)/usr/share/doc
+
+$(OPENSSH_SERVER_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
+       rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL
+       cp $(OPENSSH_IPK_DIR)/openssh.server.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
+       cp $(OPENSSH_IPK_DIR)/openssh.server.conffiles $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/conffiles
+       cp $(OPENSSH_IPK_DIR)/openssh.server.preinst $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/preinst
+       chmod a+x $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/preinst
+       cp $(OPENSSH_IPK_DIR)/openssh.server.postinst $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/postinst
+       chmod a+x $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/postinst
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/etc/init.d
+       cp $(OPENSSH_IPK_DIR)/openssh.server.sshd_config $(OPENSSH_IPK_BUILD_DIR)/build/etc/sshd_config
+       cp $(OPENSSH_IPK_DIR)/openssh.server.S50sshd-ipk $(OPENSSH_IPK_BUILD_DIR)/build/etc/init.d/S50sshd
+       chmod a+x $(OPENSSH_IPK_BUILD_DIR)/build/etc/init.d/S50sshd
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
+       cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/sshd $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
+       cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-keygen $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
+       cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
+       rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
+
+$(OPENSSH_CLIENT_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
+       rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL
+       cp $(OPENSSH_IPK_DIR)/openssh.client.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
+       cp $(OPENSSH_IPK_DIR)/openssh.client.conffiles $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/conffiles
+       cp $(OPENSSH_IPK_DIR)/openssh.client.preinst $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/preinst
+       chmod a+x $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/preinst
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/etc
+       cp $(OPENSSH_IPK_DIR)/openssh.client.ssh_config $(OPENSSH_IPK_BUILD_DIR)/build/etc/ssh_config
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
+       cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
+       cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/scp $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
+       cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
+       rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
+
+$(OPENSSH_SFTP_SERVER_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
+       rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL
+       cp $(OPENSSH_IPK_DIR)/openssh.sftp-server.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
+       cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/sftp-server $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
+       cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
+       rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
+
+$(OPENSSH_SFTP_CLIENT_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
+       rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL
+       cp $(OPENSSH_IPK_DIR)/openssh.sftp-client.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
+       cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/sftp $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
+       cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
+       rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
+
+$(OPENSSH_CLIENT_EX_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
+       rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL
+       cp $(OPENSSH_IPK_DIR)/openssh.client.ex.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
+       cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-add $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
+       cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-agent $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
+       cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-keyscan $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
+       mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
+       cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/ssh-keysign $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
+       cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
+       rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
+
+openssh-ipk: $(OPENSSH_SERVER_IPK) $(OPENSSH_CLIENT_IPK) \
+             $(OPENSSH_SFTP_SERVER_IPK) $(OPENSSH_SFTP_CLIENT_IPK) \
+            $(OPENSSH_CLIENT_EX_IPK)
+
 openssh-source: $(DL_DIR)/$(OPENSSH_SOURCE)
 
 openssh-clean: