* update 1.5 -> 1.5.3

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunk@651 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 106 insertions, 79 deletions

diff --git a/rules/lsh.make b/rules/lsh.make
index e5657571c..7b90eb376 100644
--- a/rules/lsh.make
+++ b/rules/lsh.make
@@ -1,8 +1,9 @@
 # -*-makefile-*-
-# $Id: lsh.make,v 1.5 2003/10/23 15:01:19 mkl Exp $
+# $Id: lsh.make,v 1.6 2003/10/26 06:27:07 mkl Exp $
 #
-# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
-# See CREDITS for details about who has contributed to this project. 
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
+#          
+# See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
 # see the README file.
@@ -11,18 +12,19 @@
 #
 # We provide this package
 #
-ifeq (y,$(PTXCONF_LSH))
+ifdef PTXCONF_LSH
 PACKAGES += lsh
 endif
 
 #
-# Paths and names 
+# Paths and names
 #
-LSH			= lsh-1.5
-LSH_URL			= http://www.lysator.liu.se/~nisse/archive/$(LSH).tar.gz
-LSH_SOURCE		= $(SRCDIR)/$(LSH).tar.gz
-LSH_DIR			= $(BUILDDIR)/$(LSH)
-LSH_EXTRACT 		= gzip -dc
+LSH_VERSION	= 1.5.3
+LSH		= lsh-$(LSH_VERSION)
+LSH_SUFFIX	= tar.gz
+LSH_URL		= http://www.lysator.liu.se/~nisse/archive/$(LSH).$(LSH_SUFFIX)
+LSH_SOURCE	= $(SRCDIR)/$(LSH).$(LSH_SUFFIX)
+LSH_DIR		= $(BUILDDIR)/$(LSH)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -30,13 +32,21 @@ LSH_EXTRACT 		= gzip -dc
 
 lsh_get: $(STATEDIR)/lsh.get
 
-$(STATEDIR)/lsh.get: $(LSH_SOURCE)
-	@$(call targetinfo, lsh.get)
+lsh_get_deps = \
+	$(LSH_SOURCE) \
+	$(STATEDIR)/lsh-patches.get
+
+$(STATEDIR)/lsh.get: $(lsh_get_deps)
+	@$(call targetinfo, $@)
+	touch $@
+
+$(STATEDIR)/lsh-patches.get:
+	@$(call get_patches, $(LSH))
 	touch $@
 
 $(LSH_SOURCE):
-	@$(call targetinfo, $(LSH_SOURCE))
-	wget -P $(SRCDIR) $(PASSIVEFTP) $(LSH_URL)
+	@$(call targetinfo, $@)
+	@$(call get, $(LSH_URL))
 
 # ----------------------------------------------------------------------------
 # Extract
@@ -44,10 +54,13 @@ $(LSH_SOURCE):
 
 lsh_extract: $(STATEDIR)/lsh.extract
 
-$(STATEDIR)/lsh.extract: $(STATEDIR)/lsh.get
-	@$(call targetinfo, lsh.extract)
-	$(LSH_EXTRACT) $(LSH_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
-	cd $(LSH_DIR) && patch -p0 < $(SRCDIR)/lsh-1.5-ptx1.diff
+lsh_extract_deps = $(STATEDIR)/lsh.get
+
+$(STATEDIR)/lsh.extract: $(lsh_extract_deps)
+	@$(call targetinfo, $@)
+	@$(call clean, $(LSH_DIR))
+	@$(call extract, $(LSH_SOURCE))
+	@$(call patchin, $(LSH))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -56,30 +69,43 @@ $(STATEDIR)/lsh.extract: $(STATEDIR)/lsh.get
 
 lsh_prepare: $(STATEDIR)/lsh.prepare
 
-lsh_prepare_deps =  $(STATEDIR)/lsh.extract
-lsh_prepare_deps += $(STATEDIR)/nettle.install
-lsh_prepare_deps += $(STATEDIR)/gmp.install
-lsh_prepare_deps += $(STATEDIR)/zlib.install
-lsh_prepare_deps += $(STATEDIR)/liboop.install
-
-LSH_AUTOCONF =
-LSH_AUTOCONF += --disable-kerberos
-LSH_AUTOCONF += --prefix=$(PTXCONF_PREFIX)  
-LSH_AUTOCONF += --disable-pam
-LSH_AUTOCONF += --disable-tcp-forward
-LSH_AUTOCONF += --disable-x11-forward
-LSH_AUTOCONF += --disable-agent-forward
-LSH_AUTOCONF += --disable-ipv6
-LSH_AUTOCONF += --disable-utmp
-LSH_AUTOCONF += --without-system-argp
-LSH_AUTOCONF += --build=$(GNU_HOST)
-LSH_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
-LSH_AUTOCONF += --with-lib-path=$(PTXCONF_PREFIX)/lib 
-LSH_AUTOCONF += --with-include-path=$(PTXCONF_PREFIX)/include
+#
+# dependencies
+#
+lsh_prepare_deps = \
+	$(STATEDIR)/virtual-xchain.install \
+	$(STATEDIR)/zlib.install \
+	$(STATEDIR)/gmp3.install \
+	$(STATEDIR)/liboop.install \
+	$(STATEDIR)/lsh.extract \
+
+LSH_PATH	=  PATH=$(CROSS_PATH)
+LSH_ENV 	=  $(CROSS_ENV)
+
+#
+# autoconf
+#
+LSH_AUTOCONF = \
+	--prefix=/usr \
+	--sysconfdir=/etc/lsh \
+	--build=$(GNU_HOST) \
+	--host=$(PTXCONF_GNU_TARGET) \
+	--disable-kerberos \
+	--disable-pam \
+	--disable-tcp-forward \
+	--disable-x11-forward \
+	--disable-agent-forward \
+	--disable-ipv6 \
+	--disable-utmp \
+	--without-system-argp
+
 
 $(STATEDIR)/lsh.prepare: $(lsh_prepare_deps)
-	@$(call targetinfo, lsh.prepare)
-	cd $(LSH_DIR) && ./configure $(LSH_AUTOCONF)
+	@$(call targetinfo, $@)
+	@$(call clean, $(LSH_DIR)/config.cache)
+	cd $(LSH_DIR) && \
+		$(LSH_PATH) $(LSH_ENV) \
+		$(LSH_DIR)/configure $(LSH_AUTOCONF)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -88,9 +114,11 @@ $(STATEDIR)/lsh.prepare: $(lsh_prepare_deps)
 
 lsh_compile: $(STATEDIR)/lsh.compile
 
-$(STATEDIR)/lsh.compile: $(STATEDIR)/lsh.prepare 
-	@$(call targetinfo, lsh.compile)
-	PATH=$(PTXCONF_PREFIX)/bin:$$PATH make -C $(LSH_DIR)
+lsh_compile_deps = $(STATEDIR)/lsh.prepare
+
+$(STATEDIR)/lsh.compile: $(lsh_compile_deps)
+	@$(call targetinfo, $@)
+	$(LSH_PATH) make -C $(LSH_DIR)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -100,7 +128,7 @@ $(STATEDIR)/lsh.compile: $(STATEDIR)/lsh.prepare
 lsh_install: $(STATEDIR)/lsh.install
 
 $(STATEDIR)/lsh.install: $(STATEDIR)/lsh.compile
-	@$(call targetinfo, lsh.install)
+	@$(call targetinfo, $@)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -109,56 +137,55 @@ $(STATEDIR)/lsh.install: $(STATEDIR)/lsh.compile
 
 lsh_targetinstall: $(STATEDIR)/lsh.targetinstall
 
-lsh_targetinstall_deps =  $(STATEDIR)/lsh.install
-lsh_targetinstall_deps += $(STATEDIR)/gmp.targetinstall
-lsh_targetinstall_deps += $(STATEDIR)/liboop.targetinstall
-lsh_targetinstall_deps += $(STATEDIR)/zlib.targetinstall
+lsh_targetinstall_deps = \
+	$(STATEDIR)/lsh.compile \
+	$(STATEDIR)/gmp.targetinstall \
+	$(STATEDIR)/liboop.targetinstall \
+	$(STATEDIR)/zlib.targetinstall
 
 $(STATEDIR)/lsh.targetinstall: $(lsh_targetinstall_deps)
-	@$(call targetinfo, lsh.targetinstall)
-        ifeq (y, $(PTXCONF_LSH_EXECUV))
+	@$(call targetinfo, $@)
+
 	mkdir -p $(ROOTDIR)/sbin
+	mkdir -p $(ROOTDIR)/bin
+	mkdir -p $(ROOTDIR)/var/spool/lsh
+
+ifdef PTXCONF_LSH_EXECUV
 	install $(PTXCONF_PREFIX)/sbin/lsh-execuv $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -S $(ROOTDIR)/sbin/lsh-execuv 
-        endif
-        ifeq (y, $(PTXCONF_LSH_PROXY))		
-	mkdir -p $(ROOTDIR)/sbin
+	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lsh-execuv 
+endif
+ifdef PTXCONF_LSH_PROXY
 	install $(PTXCONF_PREFIX)/sbin/lsh_proxy $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -S $(ROOTDIR)/sbin/lsh_proxy 
-        endif
-        ifeq (y, $(PTXCONF_LSH_LSHD))	
-	mkdir -p $(ROOTDIR)/sbin
+	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lsh_proxy 
+endif
+ifdef PTXCONF_LSH_LSHD
 	install $(LSH_DIR)/src/lshd $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -S $(ROOTDIR)/sbin/lshd 
-        endif
-        ifeq (y, $(PTXCONF_LSH_SFTPD))
-	mkdir -p $(ROOTDIR)/sbin
+	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lshd 
+endif
+ifdef PTXCONF_LSH_SFTPD
 	install $(PTXCONF_PREFIX)/sbin/sftp-server $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -S $(ROOTDIR)/sbin/sftp-server
-        endif
-        ifeq (y, $(PTXCONF_LSH_MAKESEED))
-	mkdir -p $(ROOTDIR)/bin
+	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/sftp-server
+endif
+ifdef PTXCONF_LSH_MAKESEED
 	install $(LSH_DIR)/src/lsh-make-seed $(ROOTDIR)/bin/
-	$(CROSSSTRIP) -S $(ROOTDIR)/bin/lsh-make-seed
-        endif
-        ifeq (y, $(PTXCONF_LSH_WRITEKEY))
-	mkdir -p $(ROOTDIR)/sbin
+	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/bin/lsh-make-seed
+endif
+ifdef PTXCONF_LSH_WRITEKEY
 	install $(LSH_DIR)/src/lsh-writekey $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -S $(ROOTDIR)/sbin/lsh-writekey
-        endif
-        ifeq (y, $(PTXCONF_LSH_KEYGEN))
-	mkdir -p $(ROOTDIR)/sbin
+	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lsh-writekey
+endif
+ifdef PTXCONF_LSH_KEYGEN
 	install $(LSH_DIR)/src/lsh-keygen $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -S $(ROOTDIR)/sbin/lsh-keygen
-        endif
-	mkdir -p $(ROOTDIR)/var/spool/lsh
+	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lsh-keygen
+endif
 	touch $@
 
 # ----------------------------------------------------------------------------
 # Clean
 # ----------------------------------------------------------------------------
 
-lsh_clean: 
-	rm -rf $(STATEDIR)/lsh.* $(LSH_DIR) 
+lsh_clean:
+	rm -rf $(STATEDIR)/lsh.*
+	rm -rf $(LSH_DIR)
 
 # vim: syntax=make