From nobody Thu Nov 23 05:00:20 2023 X-Original-To: dev-commits-ports-all@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 4SbQsd0pNnz51Qsr; Thu, 23 Nov 2023 05:00:21 +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 4SbQsc4bdhz4ZDT; Thu, 23 Nov 2023 05:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700715620; 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=ukl/wvFHqQ8mlY/EOryShxsB8oDBoddiodc+hmPsHa4=; b=hzVx8s9m2JULy6030W4UZHdBLI5pT2xfgD9t+OEseFxy4LZPPQnv0N4pk+8tUoFDK4ay1w +93bmo8QvUq5YFz7p9REbJ45dn3cC8UDGvminpXzp6EukEKzdbkid26nfv8R5VJxBb3Ssn sAazbuXn9LVYHSZBPtuWDqcGdNb4amYhg8tUpni7ZNXJ64xo3aspurK72Vsm9xtoOc2GUT P3vQeCYaeRt6hiT2y85VYxXkYVgzu3A7OQ/2zqO+gdSsVTcHc1Olw/+WSB/0vLnuWFQFDX pSJmoBVJrUFgQhd5BXDQ6IVNAbBBwhiaij4AjztZyRqc4vJlTgBRBQGmAuwM8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700715620; 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=ukl/wvFHqQ8mlY/EOryShxsB8oDBoddiodc+hmPsHa4=; b=HVG7qsjU8eTyoAiAse+hPIk8vu0vatEDt2xRUDR9X6dg0kiwIST7DEpPU3yI8bBMrhvgZh Mv4ilz2CzsnFnXQnQTrTDeT+w3l/Rttgiks5vINAUiSgupIkE4Wj6s6vtmIYhCF5+Vi5sC s1J5VV2OzqEJf/ESdRNojMh+rSRci9YXbpsHbcLfjdkk4H3f6O7rq2IauPm82coeYQ0C68 Cj9IvS2s/ULHxWZO2c5Ts19Y8ZsxrrPYUkZMOcGwwpe8D6BwaiwGWT6Q66WOdVfMYLiUjQ Z+S3KEKT16mcTJoGRG34+NVdjudgT/dphJd8SMbqpklRZOlhdpvqAWV7E4FSjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700715620; a=rsa-sha256; cv=none; b=Z5z+9ZpeH5wbXq+VO5mAswJjBKJBoqwUVQkvPOpelaESacLD8isTJ+1NuClaagI8DXAe3e ZkyymDLF7dscEGdqMr9AAh79ooseKYukWrd7mR5zKOu0JK4AL4DHBgrRoaqHO0aH6af9ak pWZ8JVH3+q4YWTFeFSWq8gAK83V3wEz6bxOiNNiD6R/ANv8JU2Qr+xKWD4075oUT0a9RJw Sr8mvSkO3XGlExqSgQbOH+RlMDLnZcngLskpufTzl1uW47NaJW/ZajhMzyGKuIQFmwoAtJ 23Fl4ZaaeKAiYuMXarCg2ow8nuFoONYw/1Y0cX+l/lasINOt0lNlkYI0DP5JXA== 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 4SbQsc2nN8zpF9; Thu, 23 Nov 2023 05:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AN50KF0098980; Thu, 23 Nov 2023 05:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AN50Ksh098977; Thu, 23 Nov 2023 05:00:20 GMT (envelope-from git) Date: Thu, 23 Nov 2023 05:00:20 GMT Message-Id: <202311230500.3AN50Ksh098977@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Romain =?utf-8?Q?Tarti=C3=A8re?= Subject: git: 56ae3aa3d376 - main - sysutils/puppetserver8: Fix logging and build aarch64 packages List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 56ae3aa3d376d770585d650c11159c04e5d26f4b Auto-Submitted: auto-generated The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=56ae3aa3d376d770585d650c11159c04e5d26f4b commit 56ae3aa3d376d770585d650c11159c04e5d26f4b Author: Romain Tartière AuthorDate: 2023-11-22 00:33:17 +0000 Commit: Romain Tartière CommitDate: 2023-11-23 04:59:23 +0000 sysutils/puppetserver8: Fix logging and build aarch64 packages Some changes in the Puppet Server recently broke logging. Ensure we write logs as before. The server work on aarch64 so add it to ONLY_FOR_ARCHS. While here, do some cleanup of the Makefile. With hat: puppet --- sysutils/puppetserver8/Makefile | 6 +++--- .../puppetserver8/files/patch-ext__config__logback.xml | 16 +++++++++++++++- sysutils/puppetserver8/files/puppetserver.in | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/sysutils/puppetserver8/Makefile b/sysutils/puppetserver8/Makefile index 660246e4fe58..7146a442c993 100644 --- a/sysutils/puppetserver8/Makefile +++ b/sysutils/puppetserver8/Makefile @@ -1,10 +1,9 @@ PORTNAME= puppetserver PORTVERSION= 8.3.0 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 8 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= puppet@FreeBSD.org COMMENT= Puppet Server running in the JVM @@ -12,7 +11,8 @@ WWW= https://docs.puppetlabs.com/puppetserver/latest/services_master_puppetserv LICENSE= APACHE20 -ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS= aarch64 amd64 +ONLY_FOR_ARCHS_REASON=Bundled JNI only support some architectures RUN_DEPENDS= bash>=0:shells/bash \ puppet8>=8.0:sysutils/puppet8 \ diff --git a/sysutils/puppetserver8/files/patch-ext__config__logback.xml b/sysutils/puppetserver8/files/patch-ext__config__logback.xml index 278ccaf5f825..22a49dbcde46 100644 --- a/sysutils/puppetserver8/files/patch-ext__config__logback.xml +++ b/sysutils/puppetserver8/files/patch-ext__config__logback.xml @@ -1,4 +1,4 @@ ---- ext/config/logback.xml.orig 2018-09-18 17:16:33 UTC +--- ext/config/logback.xml.orig 2023-10-19 16:09:06 UTC +++ ext/config/logback.xml @@ -6,12 +6,11 @@ @@ -15,3 +15,17 @@ 200MB 90 +@@ -23,11 +22,11 @@ + + + +- /var/log/puppetlabs/puppetserver/puppetserver-status.log ++ /var/log/puppetserver/puppetserver-status.log + true + + +- /var/log/puppetlabs/puppetserver/puppetserver-status-%d{yyyy-MM-dd}.%i.log.gz ++ /var/log/puppetserver/puppetserver-status-%d{yyyy-MM-dd}.%i.log.gz + + 200MB + 90 diff --git a/sysutils/puppetserver8/files/puppetserver.in b/sysutils/puppetserver8/files/puppetserver.in index e32698e335cc..65ab0c6714ac 100644 --- a/sysutils/puppetserver8/files/puppetserver.in +++ b/sysutils/puppetserver8/files/puppetserver.in @@ -54,7 +54,7 @@ pidfile="/var/run/puppetserver/puppetserver.pid" command="/usr/sbin/daemon" java_cmd="${puppetserver_java_home}/bin/java" procname="${java_cmd}" -command_args="-f -p ${pidfile} ${java_cmd} ${puppetserver_java_opts} -cp %%DATADIR%%/puppet-server-release.jar:%%PREFIX%%/lib/ruby/vendor_ruby/facter.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}" +command_args="-f -p ${pidfile} ${java_cmd} -Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger -Dlogappender=F1 ${puppetserver_java_opts} -cp %%DATADIR%%/puppet-server-release.jar:%%PREFIX%%/lib/ruby/vendor_ruby/facter.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}" required_files="${java_cmd}"