Changeset 20081


Ignore:
Timestamp:
2010-03-09T12:51:55+01:00 (8 years ago)
Author:
tripolar
Message:

update opennsh to 5.4p1 and move ssk-kegen out of openssh-client-utils and openssh-server
and create a seperate package for it - to get rid of problems when both packages
are installed at the same time

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/openssh/Makefile

    r19705 r20081  
    99 
    1010PKG_NAME:=openssh 
    11 PKG_VERSION:=5.3p1 
     11PKG_VERSION:=5.4p1 
    1212PKG_RELEASE:=1 
    1313 
     
    1717                ftp://ftp.belnet.be/packages/openbsd/OpenSSH/portable/ \ 
    1818                ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/ 
    19 PKG_MD5SUM:=13563dbf61f36ca9a1e4254260131041 
     19PKG_MD5SUM:=da10af8a789fa2e83e3635f3a1b76f5e 
    2020 
    2121PKG_BUILD_DEPENDS:=libopenssl 
     
    4343  SECTION:=net 
    4444  CATEGORY:=Network 
    45   DEPENDS:=openssh-client 
     45  DEPENDS:=+openssh-client +openssh-keygen 
    4646  TITLE:=OpenSSH client utilities 
    4747  URL:=http://www.openssh.com/ 
     
    5353endef 
    5454 
     55define Package/openssh-keygen 
     56  SECTION:=net 
     57  CATEGORY:=Network 
     58  DEPENDS:=+libopenssl +zlib 
     59  TITLE:=OpenSSH keygen 
     60  URL:=http://www.openssh.com/ 
     61  SUBMENU:=SSH 
     62endef 
     63 
     64define Package/openssh-keygen/description 
     65OpenSSH keygen. 
     66endef 
     67 
    5568define Package/openssh-server 
    5669  SECTION:=net 
    5770  CATEGORY:=Network 
    58   DEPENDS:=+libopenssl +zlib 
     71  DEPENDS:=+libopenssl +zlib +openssh-keygen 
    5972  TITLE:=OpenSSH server 
    6073  URL:=http://www.openssh.com/ 
     
    144157define Package/openssh-client-utils/install 
    145158        $(INSTALL_DIR) $(1)/usr/bin 
    146         $(INSTALL_BIN) $(foreach bin,add agent keyscan keysign keygen,$(PKG_BUILD_DIR)/ssh-$(bin)) $(1)/usr/bin/ 
    147 endef 
     159        $(INSTALL_BIN) $(foreach bin,add agent keyscan keysign,$(PKG_BUILD_DIR)/ssh-$(bin)) $(1)/usr/bin/ 
     160endef 
     161 
     162define Package/openssh-keygen/install 
     163        $(INSTALL_DIR) $(1)/usr/bin 
     164        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/ 
     165endef 
     166 
    148167 
    149168define Package/openssh-server/install 
     
    153172        $(INSTALL_DIR) $(1)/etc/init.d 
    154173        $(INSTALL_BIN) ./files/sshd.init $(1)/etc/init.d/sshd 
    155         $(INSTALL_DIR) $(1)/usr/bin 
    156         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/ 
    157174        $(INSTALL_DIR) $(1)/usr/sbin 
    158175        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/ 
     
    213230$(eval $(call BuildPackage,openssh-client)) 
    214231$(eval $(call BuildPackage,openssh-client-utils)) 
     232$(eval $(call BuildPackage,openssh-keygen)) 
    215233$(eval $(call BuildPackage,openssh-server)) 
    216234$(eval $(call BuildPackage,openssh-sftp-client)) 
Note: See TracChangeset for help on using the changeset viewer.