Changeset 24661


Ignore:
Timestamp:
2010-12-18T08:03:46+01:00 (7 years ago)
Author:
swalker
Message:

[packages] rssh: update to 2.3.3, add missing DESTDIR for rssh_chroot_helper, fix conf perms, add /etc/shells postinst and cleanup Makefile

Location:
packages/net/rssh
Files:
2 added
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/rssh/Makefile

    r16438 r24661  
    1 #  
    2 # Copyright (C) 2007 OpenWrt.org 
     1# 
     2# Copyright (C) 2007-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=rssh 
    11 PKG_VERSION:=2.3.2 
     11PKG_VERSION:=2.3.3 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=@SF/rssh 
    16 PKG_MD5SUM:=65712f2c06ff5fc6fc783bc8c2e4e1ba 
     16PKG_MD5SUM:=b0c147602fcc95737ed50573b92fc468 
     17 
     18PKG_INSTALL:=1 
    1719 
    1820include $(INCLUDE_DIR)/package.mk 
     
    3638endef 
    3739 
    38 define Build/Configure 
    39         $(call Build/Configure/Default,\ 
    40                 --with-sftp-server="/usr/libexec/sftp-server" \ 
    41                 ,\ 
    42                 ac_cv_func_malloc_0_nonnull=yes \ 
    43         ) 
     40CONFIGURE_ARGS += \ 
     41        --with-sftp-server="/usr/libexec/sftp-server" \ 
     42 
     43CONFIGURE_VARS += \ 
     44        ac_cv_func_malloc_0_nonnull=yes \ 
     45 
     46define Package/rssh/install 
     47        $(INSTALL_DIR) $(1)/etc 
     48        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME).conf $(1)/etc/ 
     49        $(INSTALL_DIR) $(1)/usr/bin 
     50        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ 
     51        $(INSTALL_DIR) $(1)/usr/lib 
     52        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/rssh_chroot_helper $(1)/usr/lib/ 
    4453endef 
    4554 
    46 define Build/Compile 
    47         $(call Build/Compile/Default,\ 
    48                 DESTDIR="$(PKG_INSTALL_DIR)" \ 
    49                 all \ 
    50         ) 
    51 endef 
    52  
    53 define Package/rssh/install 
    54         $(INSTALL_DIR) $(1)/etc/ 
    55         $(INSTALL_CONF) $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(1)/etc/ 
    56         $(INSTALL_DIR) $(1)/usr/sbin 
    57         $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin 
    58         $(INSTALL_DIR) $(1)/usr/lib/ 
    59         $(INSTALL_BIN) $(PKG_BUILD_DIR)/rssh_chroot_helper $(1)/usr/lib/ 
     55define Package/rssh/postinst 
     56#!/bin/sh 
     57grep rssh $${IPKG_INSTROOT}/etc/shells || \ 
     58        echo "/usr/bin/rssh" >> $${IPKG_INSTROOT}/etc/shells 
    6059endef 
    6160 
Note: See TracChangeset for help on using the changeset viewer.