Переглянути джерело

openssh: provide an avahi service file

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>
Michael Heimpold 10 роки тому
джерело
коміт
1c6580d05d
2 змінених файлів з 32 додано та 2 видалено
  1. 23
    2
      net/openssh/Makefile
  2. 9
    0
      net/openssh/files/sftp-ssh.service

+ 23
- 2
net/openssh/Makefile Переглянути файл

@@ -1,5 +1,5 @@
1 1
 #
2
-# Copyright (C) 2006-2011 OpenWrt.org
2
+# Copyright (C) 2006-2014 OpenWrt.org
3 3
 #
4 4
 # This is free software, licensed under the GNU General Public License v2.
5 5
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=openssh
11 11
 PKG_VERSION:=6.7p1
12
-PKG_RELEASE:=2
12
+PKG_RELEASE:=3
13 13
 
14 14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
15 15
 PKG_SOURCE_URL:=http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -131,6 +131,21 @@ define Package/openssh-sftp-server/description
131 131
 OpenSSH SFTP server.
132 132
 endef
133 133
 
134
+define Package/openssh-sftp-avahi-service
135
+	$(call Package/openssh/Default)
136
+	TITLE+= (SFTP Avahi service)
137
+	DEPENDS:=+openssh-sftp-server +avahi-daemon
138
+endef
139
+
140
+define Package/openssh-sftp-avahi-service/description
141
+ This package contains the service definition for announcing
142
+ SFTP support via mDNS/DNS-SD.
143
+endef
144
+
145
+define Package/openssh-sftp-avahi-service/conffiles
146
+/etc/avahi/services/sftp-ssh.service
147
+endef
148
+
134 149
 CONFIGURE_ARGS+= \
135 150
 	$(DISABLE_NLS) \
136 151
 	--sysconfdir=/etc/ssh \
@@ -259,6 +274,11 @@ define Package/openssh-sftp-server/install
259 274
 	ln -sf ../lib/sftp-server $(1)/usr/libexec/sftp-server
260 275
 endef
261 276
 
277
+define Package/openssh-sftp-avahi-service/install
278
+	$(INSTALL_DIR) $(1)/etc/avahi/services
279
+	$(INSTALL_DATA) ./files/sftp-ssh.service $(1)/etc/avahi/services/
280
+endef
281
+
262 282
 $(eval $(call BuildPackage,openssh-client))
263 283
 $(eval $(call BuildPackage,openssh-moduli))
264 284
 $(eval $(call BuildPackage,openssh-client-utils))
@@ -267,3 +287,4 @@ $(eval $(call BuildPackage,openssh-server))
267 287
 $(eval $(call BuildPackage,openssh-server-pam))
268 288
 $(eval $(call BuildPackage,openssh-sftp-client))
269 289
 $(eval $(call BuildPackage,openssh-sftp-server))
290
+$(eval $(call BuildPackage,openssh-sftp-avahi-service))

+ 9
- 0
net/openssh/files/sftp-ssh.service Переглянути файл

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