Changeset 2741

Show
Ignore:
Timestamp:
19.11.2008 14:58:58 (7 weeks ago)
Author:
Whoopie
Message:

expat: small cleanup
dropbear: add sftp-server support (based on MaxMuster's patch in the IPPF)
openssh: add version 5.1p1 for the sftp-server binary

Location:
trunk
Files:
6 added
5 modified

Legend:

Unmodified
Added
Removed

  • trunk/CHANGELOG

    r2736 r2741  
    3939    * nfs-utils 1.1.3 
    4040    * nfsd-cgi 0.1 
     41    * openssh 5.1p1 
    4142    * pciutils 3.0.0 
    4243    * portmap 6.0 

  • trunk/make/Config.in

    r2711 r2741  
    105105source make/nfsroot/Config.in 
    106106source make/obexftp/Config.in 
     107source make/openssh/Config.in 
    107108source make/portmap/Config.in 
    108109source make/pppd/Config.in 

  • trunk/make/dropbear/Config.in

    r2732 r2741  
    3838        help 
    3939                ZLIB Compression for SSH Traffic 
     40 
     41config FREETZ_PACKAGE_DROPBEAR_SFTP_SERVER 
     42        bool "Add sftp server" 
     43        depends on FREETZ_PACKAGE_DROPBEAR  
     44        select FREETZ_PACKAGE_OPENSSH 
     45        default n 

  • trunk/make/dropbear/dropbear.mk

    r2732 r2741  
    1212endif 
    1313 
     14ifeq ($(strip $(FREETZ_PACKAGE_DROPBEAR_SFTP_SERVER)),y) 
     15CPPFLAGS:=-DSFTPSERVER_PATH='\"/usr/lib/sftp-server\"' 
     16endif 
     17 
    1418ifeq ($(strip $(FREETZ_PACKAGE_DROPBEAR_WITH_ZLIB)),y) 
    1519$(PKG)_DEPENDS_ON := zlib 
    1620endif 
    1721 
     22ifeq ($(strip $(FREETZ_PACKAGE_DROPBEAR_SFTP_SERVER)),y) 
     23$(PKG)_DEPENDS_ON += openssh 
     24endif 
     25 
    1826$(PKG)_CONFIG_SUBOPTS += FREETZ_PACKAGE_DROPBEAR_SERVER_ONLY 
    1927$(PKG)_CONFIG_SUBOPTS += FREETZ_PACKAGE_DROPBEAR_WITH_ZLIB 
     28$(PKG)_CONFIG_SUBOPTS += FREETZ_PACKAGE_DROPBEAR_SFTP_SERVER 
    2029 
    2130$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_DROPBEAR_WITH_ZLIB),,--disable-zlib) 
    … …  
    3948$($(PKG)_BINARY): $($(PKG)_DIR)/.configured 
    4049        PATH="$(TARGET_PATH)" \ 
    41                 $(MAKE) $(DROPBEAR_MAKE_OPTIONS) -C $(DROPBEAR_DIR) 
     50                $(MAKE) -C $(DROPBEAR_DIR) \ 
     51                $(DROPBEAR_MAKE_OPTIONS) CPPFLAGS="$(CPPFLAGS)" 
    4252 
    4353$($(PKG)_TARGET_BINARY): $($(PKG)_BINARY) 

  • trunk/make/libs/expat.mk

    r2736 r2741  
    3636$(pkg)-clean: 
    3737        -$(MAKE) -C $(EXPAT_DIR) clean 
    38         rm -rf $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libexpat.* 
     38        $(RM) $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libexpat.* \ 
     39                $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/include/expat*.h 
    3940 
    4041$(pkg)-uninstall: 
    41         rm -f $(EXPAT_TARGET_DIR)/libexpat*.so* 
     42        $(RM) $(EXPAT_TARGET_DIR)/libexpat*.so* 
    4243 
    4344$(PKG_FINISH)