From nobody Sat Aug 06 03:04:32 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M06kn1NCTz4YbF0; Sat, 6 Aug 2022 03:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M06km5YWbz3Zsb; Sat, 6 Aug 2022 03:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659755072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SE/ZdKyC6WZNGZp6ifhfs3hhTz3z//zCtelpqZL4L6A=; b=cmRYyQh4ppFVMPuy6VzyPE0XcWAzUd1kzwOB2qfcGN2ERsYfkmYHxpPYHUXDxjI8jOnSfo gPG418VgUvT44DiTrL1e+GOgCFWW0Hub0e7sPjPOHg0mzJ0na6NlacwNe/6z7MnTeWRlmQ YudeOe5tPnK1TseO9F6Uic4ZbWob8C4GFahW6XRfjFLNbSHcEyKKvpGFpA8r6IvNfzuOWP CMpvoQ/ouaJnwW/s17WyZ15CX8LYn16Rx3LPyD8w04e3tvCmNo/Rk2Jd4SRKBlrZtPuGXV GnhjHshW9VGmBsbEQnneq0a6Zo+P11NY7iZdmoj0FUedqtMwTCRxOcGrjiDWtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M06km4gFszHmR; Sat, 6 Aug 2022 03:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27634W2N087050; Sat, 6 Aug 2022 03:04:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27634Wrn087049; Sat, 6 Aug 2022 03:04:32 GMT (envelope-from git) Date: Sat, 6 Aug 2022 03:04:32 GMT Message-Id: <202208060304.27634Wrn087049@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Romain=20Tarti=C3=A8re?= Subject: git: 459ff474565e - main - sysutils/puppetserver7: Update to 7.9.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 459ff474565e5a6cc3a8d936363ae0900d37f0d2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659755072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SE/ZdKyC6WZNGZp6ifhfs3hhTz3z//zCtelpqZL4L6A=; b=JjUudaTCs6bDQVWae5pxxa2Ro3SKX/P5Gmh1j9ORzuVCwnJqWw6QBj74T7PlMSFRCbaJa8 3Gasy+f6+y/gijGoO6VQ3H2ywI2Lom6SBEnoSN/QhlrM23g+IRDbqT9fgoaLvha/dZSK2+ kVERrKZXQHsGTIEEbUmMuh4W1WG/RRYv5f9XOkor8IKpnnFWZqP18LZEx/eOKu8QJLpqIY FJFBshW/25ULBbPqIlzRqsXvFdNgq9tngDC/JEKBzAK4HyD5hbpfnXxqUraIjUClhqXW2x t4KGXyOaEXJj96xOyGTEDD3fla9NDo+/oHRM6D0U1i+VVwZw5a+OkkrnaQe6Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659755072; a=rsa-sha256; cv=none; b=GjzV3/E3j5O+9ON/wRTh3Y23Mok4shRcf2iflISfg2QtFaE0XLGJFWe332wHKN+c0GqKPX VJt0hX6weE98czrxXhJkdX4on4/r4X0FdYms3CjzFt5Xu/t41SpqNdNVBDri/rmucyI39M tCL+VE3XmKIi1mGphDY8LtxFSySoxNb23hlFCUj7NWm7A2si3ilXcuS7q1WMs+H88qUO+v 5MsCNlga3D2QRJLWEmp55FmVo3DgqkB1Za+R0G7ZpBwOwht8iwZQ99T7uLogUgQaU3NHxC fpHYboJsyYT61Ozm4tXrWEbt+w1ZlbGrbwSCE+sdRbSNvlAg0nZwJsnqJukTRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=459ff474565e5a6cc3a8d936363ae0900d37f0d2 commit 459ff474565e5a6cc3a8d936363ae0900d37f0d2 Author: Romain Tartière AuthorDate: 2022-08-06 01:58:10 +0000 Commit: Romain Tartière CommitDate: 2022-08-06 03:04:10 +0000 sysutils/puppetserver7: Update to 7.9.0 Release notes: https://puppet.com/docs/puppet/7/server/release_notes.html#puppet-server-790 With hat: puppet --- sysutils/puppetserver7/Makefile | 16 +++++----------- sysutils/puppetserver7/distinfo | 8 +++----- sysutils/puppetserver7/files/patch-ffi.rb | 19 ------------------- sysutils/puppetserver7/pkg-plist | 1 - 4 files changed, 8 insertions(+), 36 deletions(-) diff --git a/sysutils/puppetserver7/Makefile b/sysutils/puppetserver7/Makefile index 0fe4ae0d146f..917ab6b93bad 100644 --- a/sysutils/puppetserver7/Makefile +++ b/sysutils/puppetserver7/Makefile @@ -1,11 +1,9 @@ PORTNAME= puppetserver -PORTVERSION= 7.8.0 +PORTVERSION= 7.9.0 CATEGORIES= sysutils java -MASTER_SITES= https://downloads.puppetlabs.com/puppet/:upstream \ - https://raw.githubusercontent.com/jruby/jruby/fb3ba4b3543b72e735ba53b51e6b7ec8a9916e1b/lib/ruby/stdlib/ffi/:ffi +MASTER_SITES= https://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 7 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:upstream \ - ffi.rb:ffi +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= puppet@FreeBSD.org @@ -40,9 +38,6 @@ GROUPS= puppet SUB_LIST= JAVA_HOME=${JAVA_HOME} SUB_FILES= pkg-message -pre-patch: - ${CP} ${_DISTDIR}/ffi.rb ${WRKSRC} - post-patch: .for file in ext/config/logback.xml ext/config/request-logging.xml \ ext/config/conf.d/global.conf ext/config/conf.d/puppetserver.conf \ @@ -59,11 +54,11 @@ post-patch: ${WRKSRC}/${file} .endfor @${REINPLACE_CMD} -e 's|#!/opt/puppetlabs/puppet/bin/ruby|#!${RUBY}|' \ - ${WRKSRC}/ext/cli/ca + ${WRKSRC}/ext/cli/ca \ + ${WRKSRC}/ext/cli/dropsonde do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps - @${MKDIR} ${STAGEDIR}${DATADIR}/lib @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d @${MKDIR} ${STAGEDIR}${ETCDIR}/services.d @${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code @@ -94,6 +89,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/ext/cli/start ${STAGEDIR}${DATADIR}/cli/apps/start ${INSTALL_DATA} ${WRKSRC}/ext/cli/stop ${STAGEDIR}${DATADIR}/cli/apps/stop ${INSTALL_DATA} ${WRKSRC}/ext/cli_defaults/cli-defaults.sh ${STAGEDIR}${DATADIR}/cli/cli-defaults.sh - ${INSTALL_DATA} ${WRKSRC}/ffi.rb ${STAGEDIR}${DATADIR}/lib .include diff --git a/sysutils/puppetserver7/distinfo b/sysutils/puppetserver7/distinfo index 54fed208e5ca..1e3195e4cd8f 100644 --- a/sysutils/puppetserver7/distinfo +++ b/sysutils/puppetserver7/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1654893281 -SHA256 (puppetserver-7.8.0.tar.gz) = d73e5ba5eb8b1645e683b15f621286073f0a5e2d0b01a1994459f8cbc84a9903 -SIZE (puppetserver-7.8.0.tar.gz) = 64651673 -SHA256 (ffi.rb) = f991c5eb6b6e4c88541af592207aa7ea14ba48f482978b3b479c4b17390e8e93 -SIZE (ffi.rb) = 5893 +TIMESTAMP = 1659750164 +SHA256 (puppetserver-7.9.0.tar.gz) = b34ada1f4fde42b24af53a10c3726ee6f1c627b9f49afc4a3a44d055bed532aa +SIZE (puppetserver-7.9.0.tar.gz) = 66386534 diff --git a/sysutils/puppetserver7/files/patch-ffi.rb b/sysutils/puppetserver7/files/patch-ffi.rb deleted file mode 100644 index 927fe2523bf2..000000000000 --- a/sysutils/puppetserver7/files/patch-ffi.rb +++ /dev/null @@ -1,19 +0,0 @@ ---- ffi.rb.orig 2019-09-22 21:04:46 UTC -+++ ffi.rb -@@ -125,7 +125,7 @@ module FFI - # Load all the platform dependent types/consts/struct members - class Config - CONFIG = Hash.new -- begin -+ if File.exist?(File.join(Platform::CONF_DIR, 'platform.conf')) - File.open(File.join(Platform::CONF_DIR, 'platform.conf'), "r") do |f| - typedef = "rbx.platform.typedef." - f.each_line { |line| -@@ -138,7 +138,6 @@ module FFI - end - } - end -- rescue Errno::ENOENT - end - end - end diff --git a/sysutils/puppetserver7/pkg-plist b/sysutils/puppetserver7/pkg-plist index 4decae04a2cc..329a3c5f8901 100644 --- a/sysutils/puppetserver7/pkg-plist +++ b/sysutils/puppetserver7/pkg-plist @@ -21,7 +21,6 @@ @(,,755) %%DATADIR%%/cli/apps/stop @(,,755) %%DATADIR%%/cli/cli-defaults.sh @(,,755) %%DATADIR%%/ezbake-functions.sh -%%DATADIR%%/lib/ffi.rb @dir(puppet,puppet,750) /var/log/puppetserver @dir(puppet,puppet,755) /var/puppet @dir(puppet,puppet,750) /var/puppet/server