diff --git a/components/network/avahi/Makefile b/components/network/avahi/Makefile index cd8fe39b6f3..f435ee7d7a4 100644 --- a/components/network/avahi/Makefile +++ b/components/network/avahi/Makefile @@ -16,16 +16,16 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= avahi -COMPONENT_VERSION= 0.6.31 -COMPONENT_REVISION= 2 +COMPONENT_VERSION= 0.6.32 COMPONENT_SUMMARY= Avahi client and bridge to pkg://service/network/dns/mdns COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 + sha256:d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454 COMPONENT_ARCHIVE_URL= \ http://avahi.org/download/$(COMPONENT_ARCHIVE) COMPONENT_PROJECT_URL = http://avahi.org +COMPONENT_CLASSIFICATION = Applications/Internet include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/configure.mk diff --git a/components/network/avahi/avahi-gui.p5m b/components/network/avahi/avahi-gui.p5m new file mode 100644 index 00000000000..cdfb2e0685c --- /dev/null +++ b/components/network/avahi/avahi-gui.p5m @@ -0,0 +1,50 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"). You may +# only use this file in accordance with the terms of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2019 Alexander Pyhalov +# + +set name=pkg.fmri value=pkg:/system/network/avahi/gui@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="Avahi client GUI libs/utils" +set name=info.classification value="$(COMPONENT_CLASSIFICATION)" +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) + +license LICENSE license='LGPLv2.1' + +file path=usr/bin/$(MACH64)/avahi-discover +file path=usr/bin/$(MACH64)/avahi-discover-standalone +link path=usr/bin/$(MACH64)/bshell target=bssh +file path=usr/bin/$(MACH64)/bssh +link path=usr/bin/$(MACH64)/bvnc target=bssh +file path=usr/bin/avahi-discover +file path=usr/bin/avahi-discover-standalone +link path=usr/bin/bshell target=bssh +file path=usr/bin/bssh +link path=usr/bin/bvnc target=bssh +file path=usr/include/avahi-ui/avahi-ui.h +link path=usr/lib/$(MACH64)/libavahi-ui.so target=libavahi-ui.so.0.1.4 +link path=usr/lib/$(MACH64)/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4 +file path=usr/lib/$(MACH64)/libavahi-ui.so.0.1.4 +file path=usr/lib/$(MACH64)/pkgconfig/avahi-ui.pc +link path=usr/lib/libavahi-ui.so target=libavahi-ui.so.0.1.4 +link path=usr/lib/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4 +file path=usr/lib/libavahi-ui.so.0.1.4 +file path=usr/lib/pkgconfig/avahi-ui.pc +file path=usr/lib/python2.7/vendor-packages/avahi_discover/__init__.py +file path=usr/share/applications/avahi-discover.desktop +file path=usr/share/applications/bssh.desktop +file path=usr/share/applications/bvnc.desktop +file path=usr/share/avahi/interfaces/avahi-discover.ui +file path=usr/share/man/man1/avahi-discover.1 +file path=usr/share/man/man1/bssh.1 +link path=usr/share/man/man1/bvnc.1 target=bssh.1 diff --git a/components/network/avahi/avahi.p5m b/components/network/avahi/avahi.p5m index f8b26bb0dac..67f73db4ec1 100644 --- a/components/network/avahi/avahi.p5m +++ b/components/network/avahi/avahi.p5m @@ -14,6 +14,7 @@ set name=pkg.fmri value=pkg:/system/network/avahi@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="$(COMPONENT_SUMMARY)" +set name=info.classification value="$(COMPONENT_CLASSIFICATION)" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=org.opensolaris.consolidation value=$(CONSOLIDATION) @@ -30,13 +31,13 @@ file usr/sbin/avahi-daemon path=usr/sbin/$(MACH32)/avahi-daemon-bridge-dsd file usr/sbin/$(MACH64)/avahi-daemon path=usr/sbin/$(MACH64)/avahi-daemon-bridge-dsd hardlink path=usr/sbin/avahi-daemon-bridge-dsd target=../lib/isaexec pkg.linted.userland.action002.0=true +depend type=conditional fmri=pkg:/system/network/avahi/gui \ + predicate=pkg:/x11/server/xserver-common file path=etc/dbus-1/system.d/avahi-dbus.conf file path=usr/bin/$(MACH64)/avahi-bookmarks file path=usr/bin/$(MACH64)/avahi-browse link path=usr/bin/$(MACH64)/avahi-browse-domains target=avahi-browse -file path=usr/bin/$(MACH64)/avahi-discover -file path=usr/bin/$(MACH64)/avahi-discover-standalone file path=usr/bin/$(MACH64)/avahi-publish link path=usr/bin/$(MACH64)/avahi-publish-address target=avahi-publish link path=usr/bin/$(MACH64)/avahi-publish-service target=avahi-publish @@ -45,11 +46,8 @@ link path=usr/bin/$(MACH64)/avahi-resolve-address target=avahi-resolve link path=usr/bin/$(MACH64)/avahi-resolve-host-name target=avahi-resolve file path=usr/bin/$(MACH64)/avahi-set-host-name link path=usr/bin/$(MACH64)/bshell target=bssh -file path=usr/bin/$(MACH64)/bssh -link path=usr/bin/$(MACH64)/bvnc target=bssh file path=usr/bin/avahi-browse link path=usr/bin/avahi-browse-domains target=avahi-browse -file path=usr/bin/avahi-discover file path=usr/bin/avahi-publish link path=usr/bin/avahi-publish-address target=avahi-publish link path=usr/bin/avahi-publish-service target=avahi-publish @@ -57,9 +55,6 @@ file path=usr/bin/avahi-resolve link path=usr/bin/avahi-resolve-address target=avahi-resolve link path=usr/bin/avahi-resolve-host-name target=avahi-resolve file path=usr/bin/avahi-set-host-name -link path=usr/bin/bshell target=bssh -file path=usr/bin/bssh -link path=usr/bin/bvnc target=bssh file path=usr/include/avahi-client/client.h file path=usr/include/avahi-client/lookup.h file path=usr/include/avahi-client/publish.h @@ -92,7 +87,6 @@ file path=usr/include/avahi-gobject/ga-error.h file path=usr/include/avahi-gobject/ga-record-browser.h file path=usr/include/avahi-gobject/ga-service-browser.h file path=usr/include/avahi-gobject/ga-service-resolver.h -file path=usr/include/avahi-ui/avahi-ui.h file path=usr/lib/$(MACH64)/avahi/service-types.db.dir file path=usr/lib/$(MACH64)/avahi/service-types.db.pag file path=usr/lib/$(MACH64)/girepository-1.0/Avahi-0.6.typelib @@ -123,16 +117,10 @@ link path=usr/lib/$(MACH64)/libavahi-gobject.so target=libavahi-gobject.so.0.0.4 link path=usr/lib/$(MACH64)/libavahi-gobject.so.0 \ target=libavahi-gobject.so.0.0.4 file path=usr/lib/$(MACH64)/libavahi-gobject.so.0.0.4 -file path=usr/lib/$(MACH64)/libavahi-ui.a -file path=usr/lib/$(MACH64)/libavahi-ui.la -link path=usr/lib/$(MACH64)/libavahi-ui.so target=libavahi-ui.so.0.1.4 -link path=usr/lib/$(MACH64)/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4 -file path=usr/lib/$(MACH64)/libavahi-ui.so.0.1.4 file path=usr/lib/$(MACH64)/pkgconfig/avahi-client.pc file path=usr/lib/$(MACH64)/pkgconfig/avahi-core.pc file path=usr/lib/$(MACH64)/pkgconfig/avahi-glib.pc file path=usr/lib/$(MACH64)/pkgconfig/avahi-gobject.pc -file path=usr/lib/$(MACH64)/pkgconfig/avahi-ui.pc file path=usr/lib/avahi/service-types.db.dir file path=usr/lib/avahi/service-types.db.pag file path=usr/lib/girepository-1.0/Avahi-0.6.typelib @@ -152,22 +140,13 @@ file path=usr/lib/libavahi-glib.so.1.0.2 link path=usr/lib/libavahi-gobject.so target=libavahi-gobject.so.0.0.4 link path=usr/lib/libavahi-gobject.so.0 target=libavahi-gobject.so.0.0.4 file path=usr/lib/libavahi-gobject.so.0.0.4 -link path=usr/lib/libavahi-ui.so target=libavahi-ui.so.0.1.4 -link path=usr/lib/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4 -file path=usr/lib/libavahi-ui.so.0.1.4 file path=usr/lib/pkgconfig/avahi-client.pc file path=usr/lib/pkgconfig/avahi-core.pc file path=usr/lib/pkgconfig/avahi-glib.pc file path=usr/lib/pkgconfig/avahi-gobject.pc -file path=usr/lib/pkgconfig/avahi-ui.pc file path=usr/lib/python2.7/vendor-packages/avahi/ServiceTypeDatabase.py pkg.tmp.autopyc=false file path=usr/lib/python2.7/vendor-packages/avahi/__init__.py -file path=usr/lib/python2.7/vendor-packages/avahi_discover/__init__.py -file path=usr/share/applications/avahi-discover.desktop -file path=usr/share/applications/bssh.desktop -file path=usr/share/applications/bvnc.desktop file path=usr/share/avahi/avahi-service.dtd -file path=usr/share/avahi/interfaces/avahi-discover.ui file path=usr/share/avahi/service-types file path=usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml file path=usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml @@ -180,6 +159,8 @@ file path=usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml file path=usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml file path=usr/share/gir-1.0/Avahi-0.6.gir file path=usr/share/gir-1.0/AvahiCore-0.6.gir +file path=usr/share/locale/ach/LC_MESSAGES/avahi.mo +file path=usr/share/locale/ar/LC_MESSAGES/avahi.mo file path=usr/share/locale/bg/LC_MESSAGES/avahi.mo file path=usr/share/locale/ca/LC_MESSAGES/avahi.mo file path=usr/share/locale/cs/LC_MESSAGES/avahi.mo @@ -190,7 +171,10 @@ file path=usr/share/locale/en_AU/LC_MESSAGES/avahi.mo file path=usr/share/locale/en_CA/LC_MESSAGES/avahi.mo file path=usr/share/locale/en_GB/LC_MESSAGES/avahi.mo file path=usr/share/locale/en_NZ/LC_MESSAGES/avahi.mo +file path=usr/share/locale/eo/LC_MESSAGES/avahi.mo file path=usr/share/locale/es/LC_MESSAGES/avahi.mo +file path=usr/share/locale/et/LC_MESSAGES/avahi.mo +file path=usr/share/locale/fa/LC_MESSAGES/avahi.mo file path=usr/share/locale/fi/LC_MESSAGES/avahi.mo file path=usr/share/locale/fo/LC_MESSAGES/avahi.mo file path=usr/share/locale/fr/LC_MESSAGES/avahi.mo @@ -200,23 +184,26 @@ file path=usr/share/locale/hu/LC_MESSAGES/avahi.mo file path=usr/share/locale/id/LC_MESSAGES/avahi.mo file path=usr/share/locale/it/LC_MESSAGES/avahi.mo file path=usr/share/locale/ja/LC_MESSAGES/avahi.mo +file path=usr/share/locale/ko/LC_MESSAGES/avahi.mo +file path=usr/share/locale/lv/LC_MESSAGES/avahi.mo file path=usr/share/locale/ms/LC_MESSAGES/avahi.mo file path=usr/share/locale/nl/LC_MESSAGES/avahi.mo file path=usr/share/locale/pl/LC_MESSAGES/avahi.mo file path=usr/share/locale/pt_BR/LC_MESSAGES/avahi.mo file path=usr/share/locale/ro/LC_MESSAGES/avahi.mo file path=usr/share/locale/ru/LC_MESSAGES/avahi.mo +file path=usr/share/locale/sk/LC_MESSAGES/avahi.mo file path=usr/share/locale/sl/LC_MESSAGES/avahi.mo file path=usr/share/locale/sr/LC_MESSAGES/avahi.mo file path=usr/share/locale/sr@latin/LC_MESSAGES/avahi.mo file path=usr/share/locale/sv/LC_MESSAGES/avahi.mo +file path=usr/share/locale/tr/LC_MESSAGES/avahi.mo file path=usr/share/locale/uk/LC_MESSAGES/avahi.mo file path=usr/share/locale/zh_CN/LC_MESSAGES/avahi.mo file path=usr/share/locale/zh_TW/LC_MESSAGES/avahi.mo link path=usr/share/man/man1/avahi-browse-domains.1 target=avahi-browse.1 file path=usr/share/man/man1/avahi-browse.1 file path=usr/share/man/man1/avahi-daemon-bridge-dsd.1 -file path=usr/share/man/man1/avahi-discover.1 link path=usr/share/man/man1/avahi-publish-address.1 target=avahi-publish.1 link path=usr/share/man/man1/avahi-publish-service.1 target=avahi-publish.1 file path=usr/share/man/man1/avahi-publish.1 @@ -224,5 +211,3 @@ link path=usr/share/man/man1/avahi-resolve-address.1 target=avahi-resolve.1 link path=usr/share/man/man1/avahi-resolve-host-name.1 target=avahi-resolve.1 file path=usr/share/man/man1/avahi-resolve.1 file path=usr/share/man/man1/avahi-set-host-name.1 -file path=usr/share/man/man1/bssh.1 -link path=usr/share/man/man1/bvnc.1 target=bssh.1