From owner-svn-ports-all@freebsd.org Mon Jan 1 12:14:14 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B1EFCEA7861; Mon, 1 Jan 2018 12:14:14 +0000 (UTC) (envelope-from tobik@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 mx1.freebsd.org (Postfix) with ESMTPS id 796426AE1C; Mon, 1 Jan 2018 12:14:14 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w01CEDEE024092; Mon, 1 Jan 2018 12:14:13 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w01CED7U024090; Mon, 1 Jan 2018 12:14:13 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201801011214.w01CED7U024090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 1 Jan 2018 12:14:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457768 - in head/net/cloud-init: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/net/cloud-init: . files X-SVN-Commit-Revision: 457768 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.25 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: Mon, 01 Jan 2018 12:14:14 -0000 Author: tobik Date: Mon Jan 1 12:14:13 2018 New Revision: 457768 URL: https://svnweb.freebsd.org/changeset/ports/457768 Log: net/cloud-init: Add ldconfig to rc.d script rcorder shows that ldconfig is running after cloudinit in some cases. This can lead to problems like the following when running it on OpenStack: Shared object "libpython2.7.so.1" not found, required by "python2.7" - Reset maintainer by request of the current maintainer PR: 224361 Submitted by: thompsa Approved by: maintainer Added: head/net/cloud-init/files/ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit (contents, props changed) Modified: head/net/cloud-init/Makefile Modified: head/net/cloud-init/Makefile ============================================================================== --- head/net/cloud-init/Makefile Mon Jan 1 12:06:46 2018 (r457767) +++ head/net/cloud-init/Makefile Mon Jan 1 12:14:13 2018 (r457768) @@ -2,11 +2,12 @@ PORTNAME= cloud-init PORTVERSION= 0.7.6 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= bertjw@regeer.org +MAINTAINER= ports@FreeBSD.org COMMENT= Init scripts for use on cloud images LICENSE= GPLv3 @@ -38,6 +39,9 @@ PYDISTUTILS_INSTALLARGS+= "--init-system=sysvinit_free 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 post-build: @cd ${WRKSRC} && ${MV} config/cloud.cfg-freebsd config/cloud.cfg Added: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit Mon Jan 1 12:14:13 2018 (r457768) @@ -0,0 +1,11 @@ +--- sysvinit/freebsd/cloudinit.orig 2018-01-01 11:58:33 UTC ++++ sysvinit/freebsd/cloudinit +@@ -1,7 +1,7 @@ + #!/bin/sh + + # PROVIDE: cloudinit +-# REQUIRE: FILESYSTEMS NETWORKING cloudinitlocal ++# REQUIRE: FILESYSTEMS NETWORKING cloudinitlocal ldconfig + # BEFORE: cloudconfig cloudfinal + + . /etc/rc.subr