Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openssh: provide an avahi service file

Browse source 
As discussed in #543, we can announce the SFTP service via Avahi
when sftp-server is installed.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
This commit is contained in:
Michael Heimpold 2014-12-08 23:08:05 +01:00
parent d1f7e907a5
commit 1c6580d05d
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
net/openssh/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2011 OpenWrt.org # Copyright (C) 2006-2014 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssh PKG_NAME:=openssh
PKG_VERSION:=6.7p1 PKG_VERSION:=6.7p1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ PKG_SOURCE_URL:=http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@ -131,6 +131,21 @@ define Package/openssh-sftp-server/description
OpenSSH SFTP server. OpenSSH SFTP server.
endef endef
define Package/openssh-sftp-avahi-service
$(call Package/openssh/Default)
TITLE+= (SFTP Avahi service)
DEPENDS:=+openssh-sftp-server +avahi-daemon
endef
define Package/openssh-sftp-avahi-service/description
This package contains the service definition for announcing
SFTP support via mDNS/DNS-SD.
endef
define Package/openssh-sftp-avahi-service/conffiles
/etc/avahi/services/sftp-ssh.service
endef
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
--sysconfdir=/etc/ssh \ --sysconfdir=/etc/ssh \
@ -259,6 +274,11 @@ define Package/openssh-sftp-server/install
ln -sf ../lib/sftp-server $(1)/usr/libexec/sftp-server ln -sf ../lib/sftp-server $(1)/usr/libexec/sftp-server
endef endef
define Package/openssh-sftp-avahi-service/install
$(INSTALL_DIR) $(1)/etc/avahi/services
$(INSTALL_DATA) ./files/sftp-ssh.service $(1)/etc/avahi/services/
endef
$(eval $(call BuildPackage,openssh-client)) $(eval $(call BuildPackage,openssh-client))
$(eval $(call BuildPackage,openssh-moduli)) $(eval $(call BuildPackage,openssh-moduli))
$(eval $(call BuildPackage,openssh-client-utils)) $(eval $(call BuildPackage,openssh-client-utils))
@ -267,3 +287,4 @@ $(eval $(call BuildPackage,openssh-server))
$(eval $(call BuildPackage,openssh-server-pam)) $(eval $(call BuildPackage,openssh-server-pam))
$(eval $(call BuildPackage,openssh-sftp-client)) $(eval $(call BuildPackage,openssh-sftp-client))
$(eval $(call BuildPackage,openssh-sftp-server)) $(eval $(call BuildPackage,openssh-sftp-server))
$(eval $(call BuildPackage,openssh-sftp-avahi-service))

9
net/openssh/files/sftp-ssh.service Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
<service-group>
<name replace-wildcards="yes">%h</name>
<service>
<type>_sftp-ssh._tcp</type>
<port>22</port>
</service>
</service-group>