From nobody Thu Nov 23 05:00:19 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 4SbQsb3M0tz51QqB; Thu, 23 Nov 2023 05:00:19 +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 4SbQsb2rCPz4ZTt; Thu, 23 Nov 2023 05:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700715619; 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=Tp2xGN4eKRfXeNNq8GJ8YOmKtZxoTFuO2ptF+yPaA80=; b=wBH4mg6fb4qGnw1TOw97Ui25DUfifkka1eUyCP15yK1rzMw1/8tWDnkcv6AU0u1BdYTqXN W7diOg7mIu+Bx8dQWBk3jL6bIH5gzR5RXVBz9XdLUbh5kRx4bkBDfePF0JSKc0ZZ/FrHUh P9J1SVQ6sH/OKCQZNISLvC48FfsGahE9SvtfUjkinel4n8YxfALc1kDqI2Z9x7xTzFRNoL LW9nF4mYO6h80jYZWq4prNhiVjDJRVpyfNiTKgVnd2jBOu5sLR4fEWIqhBN2p6UXWHj69K bzHZXomcSjyMUWyhPOvocGgDoZJ8jQ7S2Rfh7nXwOPQxJZsw7RY2Jp6HmH+HZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700715619; 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=Tp2xGN4eKRfXeNNq8GJ8YOmKtZxoTFuO2ptF+yPaA80=; b=ejNxLEdOcHCd3bTdV44eLa/UFFFsaXm75FPUlkYYs6BW+gQFAg5YX9NJ74ZLmuGewbCUiU VyZHwLR5e2Wi/ICTslKC/q6wP+o3Y8GHHuP5L2gwDeq/X0Xw57SzSwILEPCEiw4Fp76uAZ RAVD46ez+4opA6nlVi9/Pa+szww19YxKi+9D7P8CGaIPaQdZb3zRCKHNpHCJPLGwavLIze DRdAguoKqBNSt2DgGzzBUhHwMP+KGnjPx2oQbXjgqT+48btyQH4011boul3xlE8ZttSZsp TAfyDbKz7wQnr6Ya6fq3O6HDVT/qzwoF07ogCLlHaL0ZDgeIpEvD90OMpeoexQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700715619; a=rsa-sha256; cv=none; b=rjQZ8iCaBV/wzCW7HDz4gGLApF2q1jZNlmUcCIRgATs+/GluFmnA4cgul9RaGdOzfjRzOY lFLbAdKcmcN2jM55wpTH+y7t2UgS6EgeJR+TKzbS9NpMNTVN7Kv3TzYo/MW+Yh/CNHtg47 dgikUkgrq9bQr9HrcPoaqbvk5fAOZe3fW92JpCszK4wXGqn9/ofRvWNJwpDxccD0b0WCF/ avVypkQ80MNmdiARKP7fcinOQ2O65uHwsr7AVjbGQ8L56EkhUXHmiT/a0f3fpX1xkBqEiL cLvEEt+PpZEtHjXqMywpxxFqG+TGlKDAP2Mr0eNAkkeVTyTcbYeKObMORQpIJA== 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 4SbQsb1wMTznS9; Thu, 23 Nov 2023 05:00:19 +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 3AN50JYI098929; Thu, 23 Nov 2023 05:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AN50Ju6098926; Thu, 23 Nov 2023 05:00:19 GMT (envelope-from git) Date: Thu, 23 Nov 2023 05:00:19 GMT Message-Id: <202311230500.3AN50Ju6098926@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: 7f03c6a64012 - main - sysutils/puppetserver7: 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: 7f03c6a6401202155c7240cf827549a51d7395d5 Auto-Submitted: auto-generated The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f03c6a6401202155c7240cf827549a51d7395d5 commit 7f03c6a6401202155c7240cf827549a51d7395d5 Author: Romain Tartière AuthorDate: 2023-11-22 00:33:49 +0000 Commit: Romain Tartière CommitDate: 2023-11-23 04:59:10 +0000 sysutils/puppetserver7: 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/puppetserver7/Makefile | 6 +++--- .../puppetserver7/files/patch-ext__config__logback.xml | 16 +++++++++++++++- sysutils/puppetserver7/files/puppetserver.in | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/sysutils/puppetserver7/Makefile b/sysutils/puppetserver7/Makefile index 03aa8711b89e..2178574621b1 100644 --- a/sysutils/puppetserver7/Makefile +++ b/sysutils/puppetserver7/Makefile @@ -1,10 +1,9 @@ PORTNAME= puppetserver PORTVERSION= 7.14.0 +PORTREVISION= 1 CATEGORIES= sysutils java MASTER_SITES= https://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 7 -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 \ puppet7>=0:sysutils/puppet7 \ diff --git a/sysutils/puppetserver7/files/patch-ext__config__logback.xml b/sysutils/puppetserver7/files/patch-ext__config__logback.xml index 278ccaf5f825..74a9d061510f 100644 --- a/sysutils/puppetserver7/files/patch-ext__config__logback.xml +++ b/sysutils/puppetserver7/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:07:56 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/puppetserver7/files/puppetserver.in b/sysutils/puppetserver7/files/puppetserver.in index e32698e335cc..65ab0c6714ac 100644 --- a/sysutils/puppetserver7/files/puppetserver.in +++ b/sysutils/puppetserver7/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}"