SF.net SVN: gar:[24974] csw/mgar/pkg/rsync/trunk

[dmichelsen at users.sourceforge.net]

Revision: 24974
          http://sourceforge.net/p/gar/code/24974
Author:   dmichelsen
Date:     2015-05-15 14:44:02 +0000 (Fri, 15 May 2015)
Log Message:
-----------
rsync/trunk: Switch to native SMF manifest

Modified Paths:
--------------
    csw/mgar/pkg/rsync/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/rsync/trunk/cswrsync.xml
    csw/mgar/pkg/rsync/trunk/files/cswrsyncd.xml

Removed Paths:
-------------
    csw/mgar/pkg/rsync/trunk/files/cswrsyncd

Modified: csw/mgar/pkg/rsync/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rsync/trunk/Makefile	2015-05-15 13:58:44 UTC (rev 24973)
+++ csw/mgar/pkg/rsync/trunk/Makefile	2015-05-15 14:44:02 UTC (rev 24974)
@@ -16,7 +16,7 @@
 
 MASTER_SITES = http://samba.anu.edu.au/ftp/rsync/
 DISTFILES += $(DISTNAME).tar.gz
-DISTFILES += cswrsyncd
+DISTFILES += cswrsyncd.xml
 DISTFILES += rsyncd.conf.CSW
 
 VENDOR_URL = http://rsync.samba.org/
@@ -27,14 +27,15 @@
 RUNTIME_DEP_PKGS_CSWrsync += CSWlibpopt0
 RUNTIME_DEP_PKGS_CSWrsync += CSWlibiconv2
 
-INITSMF += /etc/opt/csw/init.d/cswrsyncd
-
 PACKAGES += CSWrsyncd
 SPKG_DESC_CSWrsyncd = Daemon for rsyncd server
 PKGFILES_CSWrsyncd += $(sysconfdir)/rsyncd.conf.CSW
 PKGFILES_CSWrsyncd += $(mandir)/man5/rsyncd.conf.5
-PKGFILES_CSWrsyncd += $(INITSMF)
+PKGFILES_CSWrsyncd += /var/opt/csw/svc/manifest/cswrsyncd.xml
 
+# This the URL of the DTD
+CHECKPKG_OVERRIDES_CSWrsyncd += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswrsyncd.xml
+
 # rsyncd is in fact rsync --daemon
 RUNTIME_DEP_PKGS_CSWrsyncd += CSWrsync
 CHECKPKG_OVERRIDES_CSWrsyncd += surplus-dependency|CSWrsync
@@ -58,14 +59,17 @@
 REINPLACE_FILES_conf += $(mandir)/man5/rsyncd.conf.5
 REINPLACE_WHEN_conf = postinstall
 
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswrsyncd.xml
+PROTOTYPE_CLASS_smf = manifest
+
 # There is one ACL-test on NFSv4 failling
 SKIPTEST ?= 1
 
 include gar/category.mk
 
 post-install:
-	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
-	ginstall -m 0755 $(WORKDIR)/cswrsyncd $(DESTDIR)/etc/opt/csw/init.d/cswrsyncd
+	ginstall -D -m 0644 $(WORKDIR)/cswrsyncd.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswrsyncd.xml
 	ginstall -d $(DESTDIR)$(sysconfdir)
 	ginstall -m 0644 $(WORKDIR)/rsyncd.conf.CSW $(DESTDIR)$(sysconfdir)
 	ginstall -d $(DESTDIR)$(sharedstatedir)/rsync/support/

Copied: csw/mgar/pkg/rsync/trunk/cswrsync.xml (from rev 24973, csw/mgar/pkg/redis/trunk/files/cswredis.xml)
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/rsync/trunk/files/cswrsyncd
===================================================================
--- csw/mgar/pkg/rsync/trunk/files/cswrsyncd	2015-05-15 13:58:44 UTC (rev 24973)
+++ csw/mgar/pkg/rsync/trunk/files/cswrsyncd	2015-05-15 14:44:02 UTC (rev 24974)
@@ -1,23 +0,0 @@
-#!/sbin/sh
-
-CONF_FILE=/etc/opt/csw/rsyncd.conf
-
-if [ ! -f ${CONF_FILE} ]; then
-  exit 0
-fi
-
-cmd="$1"
-
-case "$cmd" in
-  start)
-    /opt/csw/bin/rsync --daemon -v
-    ;;
-  stop)
-    /usr/bin/pkill -x -u 0 rsync
-    ;;
-  *)
-    echo "Usage: $0 {start|stop}"
-    exit 1
-    ;;
-esac
-

Copied: csw/mgar/pkg/rsync/trunk/files/cswrsyncd.xml (from rev 24973, csw/mgar/pkg/redis/trunk/files/cswredis.xml)
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.