From owner-svn-ports-all@freebsd.org Thu Aug 2 12:05:47 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B73C41065086; Thu, 2 Aug 2018 12:05:47 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6DA6984FC6; Thu, 2 Aug 2018 12:05:47 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4EA9D11704; Thu, 2 Aug 2018 12:05:47 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w72C5lOL060035; Thu, 2 Aug 2018 12:05:47 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w72C5kS7060030; Thu, 2 Aug 2018 12:05:46 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201808021205.w72C5kS7060030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Thu, 2 Aug 2018 12:05:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476232 - in head/net/cloud-init: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zi X-SVN-Commit-Paths: in head/net/cloud-init: . files X-SVN-Commit-Revision: 476232 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Aug 2018 12:05:48 -0000 Author: zi Date: Thu Aug 2 12:05:46 2018 New Revision: 476232 URL: https://svnweb.freebsd.org/changeset/ports/476232 Log: - Bump PORTREVISION - Fix rc script errors - Fix config file location Added: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig (contents, props changed) head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal (contents, props changed) head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal (contents, props changed) Deleted: head/net/cloud-init/pkg-plist Modified: head/net/cloud-init/Makefile head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit Modified: head/net/cloud-init/Makefile ============================================================================== --- head/net/cloud-init/Makefile Thu Aug 2 11:54:36 2018 (r476231) +++ head/net/cloud-init/Makefile Thu Aug 2 12:05:46 2018 (r476232) @@ -2,6 +2,7 @@ PORTNAME= cloud-init PORTVERSION= 18.3 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -40,7 +41,9 @@ ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= currently depends on dmidecode which is x86-only post-patch: - @${RM} ${WRKSRC}/sysvinit/freebsd/cloudinit.orig + ${REINPLACE_CMD} -e 's|"etc"|"${STAGEDIR}${PREFIX}/etc"|g' ${WRKSRC}/setup.py + ${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/cloudinit/settings.py + @${RM} ${WRKSRC}/sysvinit/freebsd/*.orig post-build: @cd ${WRKSRC} && ${MV} sysvinit/freebsd/cloudconfig config/cloud.cfg Added: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig Thu Aug 2 12:05:46 2018 (r476232) @@ -0,0 +1,10 @@ +--- sysvinit/freebsd/cloudconfig.orig 2018-08-01 15:31:13 UTC ++++ sysvinit/freebsd/cloudconfig +@@ -22,4 +22,7 @@ cloudconfig_start() + } + + load_rc_config $name ++ ++: ${cloudconfig_enable="NO"} ++ + run_rc_command "$1" Added: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal Thu Aug 2 12:05:46 2018 (r476232) @@ -0,0 +1,10 @@ +--- sysvinit/freebsd/cloudfinal.orig 2018-08-01 15:31:17 UTC ++++ sysvinit/freebsd/cloudfinal +@@ -22,4 +22,7 @@ cloudfinal_start() + } + + load_rc_config $name ++ ++: ${cloudfinal_enable="NO"} ++ + run_rc_command "$1" Modified: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit ============================================================================== --- head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit Thu Aug 2 11:54:36 2018 (r476231) +++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit Thu Aug 2 12:05:46 2018 (r476232) @@ -1,4 +1,4 @@ ---- sysvinit/freebsd/cloudinit.orig 2018-01-01 11:58:33 UTC +--- sysvinit/freebsd/cloudinit.orig 2018-08-01 15:31:22 UTC +++ sysvinit/freebsd/cloudinit @@ -1,7 +1,7 @@ #!/bin/sh @@ -9,3 +9,11 @@ # BEFORE: cloudconfig cloudfinal . /etc/rc.subr +@@ -22,4 +22,7 @@ cloudinit_start() + } + + load_rc_config $name ++ ++: ${cloudinit_enable="NO"} ++ + run_rc_command "$1" Added: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal Thu Aug 2 12:05:46 2018 (r476232) @@ -0,0 +1,10 @@ +--- sysvinit/freebsd/cloudinitlocal.orig 2018-08-01 15:31:29 UTC ++++ sysvinit/freebsd/cloudinitlocal +@@ -22,4 +22,7 @@ cloudlocal_start() + } + + load_rc_config $name ++ ++: ${cloudinitlocal_enable="NO"} ++ + run_rc_command "$1"