From nobody Tue Apr 19 10:32:26 2022 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 31DAA11C9C78; Tue, 19 Apr 2022 10:32:28 +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 4KjKqv24yPz3Fjp; Tue, 19 Apr 2022 10:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650364347; 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=Vygnmp2+PwIsVLFnQ70FQgJwAeSJJNdqF9vbuGH3zzA=; b=Cby9M1G76Mp9Y9HUo8HOakyQXumsy6VBd5AFm0BJMAc56ZnB6OyghvRYlCNHXzDfcTH+H+ q1SDhRSEwgcoXeqiJodWJ39fLjX3xkkwXb5GMKVQtFOqo810BXeNMy4jwxps/KP5LAtDME sql03TgFf9zxeSR1C91xC1Bkbob4emf/NGpceWPzqTjvLPsa9pn9ss23hgBstqP5EP/nrH ngdKym8mw67//UvlH+iqVoH6OFQj6Z4TQv6HM2XdbYvxgcZnBNfkJCZjWnKr8LolPnygbc zAJugnpFENqBC1WsuVrJP61I1J2pngUh1T4tlNKIEKDKNY+UdbhWRHAUw8UCrQ== 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 D143E251F7; Tue, 19 Apr 2022 10:32:26 +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 23JAWQYV053844; Tue, 19 Apr 2022 10:32:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23JAWQ2D053843; Tue, 19 Apr 2022 10:32:26 GMT (envelope-from git) Date: Tue, 19 Apr 2022 10:32:26 GMT Message-Id: <202204191032.23JAWQ2D053843@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: a234961c4069 - main - net/foreman-proxy: update 2.0.3 -> 2.1.4 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a234961c40695bfbf00dcabfc8fc3095183b3ab9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650364347; 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=Vygnmp2+PwIsVLFnQ70FQgJwAeSJJNdqF9vbuGH3zzA=; b=X/i9+ub57uS1NcRHKYxMBioGOdcj6FGZEi8Y7+MaTV8ZsrloeSbKxs+TxELzlhU9Fq2VTf 7cbwJ7UuV2n5S+74/Su+ycn21Q+4oO9Fg6lX/Z/AOUPNLzpxhWrxuybE6hnrVedbYCAyaZ t53q0xZ79Y0DKSvtecCSDEk126Ot8w8il9a56wVhsiz8ltwY0cvpeffNj58PBAxj709v8m yGQjhfMyIyhiE9Bzqi8IlUvARc/ROwfmPl6vU2Etm/rydkfZpT7KPA6koI/Afczf6l+urR 3bQBCWdZ9G4jsxBBvMynnsTBMPciL65HmlMXoaUKOmZCZw6tD2NzEzRyePRqnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650364347; a=rsa-sha256; cv=none; b=Lg1gI3ufjcl7FNSMe8xNQ6mLScHUnmR/taxFcclKw0+sZWlbWbH0KfHTXiDQl92NVx64aU WkbeEQ6WmF9bPb1OkTRSmyHxi6ZKQIFiw0SC1UwqYzpUiMe4YawcLyKeNU1DxYYeOU7FFt GQ4dTykpKDYchiyzYCjVT1hIO89eYxUweM9THDIfh0R3vKOhw/JahTywHga8KQhhDTXCr1 Enuxm3e2Wk3X+C9ig7rL+qrhz8pkjLpTXsNXdjnJi6kcsSEqps9xA3zs9R+T5JEQRIyBJ9 s8riwMJd5+s7EwZINnUM2r/W7Rsvk56RZpLg8as2nSY/uEua3jLktP5wGuXQ1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=a234961c40695bfbf00dcabfc8fc3095183b3ab9 commit a234961c40695bfbf00dcabfc8fc3095183b3ab9 Author: Jason Unovitch AuthorDate: 2021-04-24 20:56:45 +0000 Commit: Matthias Fechner CommitDate: 2022-04-19 10:27:10 +0000 net/foreman-proxy: update 2.0.3 -> 2.1.4 Changes: https://github.com/theforeman/smart-proxy/compare/2.0.3...2.1.4 PR: 253008 Submitted by: junovitch --- net/foreman-proxy/Makefile | 6 +++--- net/foreman-proxy/distinfo | 6 +++--- net/foreman-proxy/files/patch-bin-smart-proxy | 2 +- net/foreman-proxy/pkg-plist | 7 +------ 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile index 585b61d21726..6697d8d82122 100644 --- a/net/foreman-proxy/Makefile +++ b/net/foreman-proxy/Makefile @@ -1,7 +1,7 @@ # Created by: Martin Matuska PORTNAME= foreman-proxy -PORTVERSION= 2.0.3 +PORTVERSION= 2.1.4 CATEGORIES= net MASTER_SITES= https://downloads.theforeman.org/foreman-proxy/ @@ -63,7 +63,7 @@ post-patch: ${WRKSRC}/bin/smart-proxy \ ${WRKSRC}/extra/migrate_settings.rb \ ${WRKSRC}/extra/query.rb \ - ${WRKSRC}/extra/register-service.rb + ${WRKSRC}/extra/register_service.rb @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/config/settings.d/*.yml.example \ @@ -80,7 +80,7 @@ do-install: ${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR} .endfor ${LN} -s Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in -.for script in foreman-debug-proxy migrate_settings.rb query.rb register-service.rb +.for script in foreman-debug-proxy migrate_settings.rb query.rb register_service.rb ${INSTALL_SCRIPT} ${WRKSRC}/extra/${script} \ ${STAGEDIR}${DATADIR}/extra/${script} .endfor diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo index 4e50f35313ca..c001b67c2088 100644 --- a/net/foreman-proxy/distinfo +++ b/net/foreman-proxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611514882 -SHA256 (foreman-proxy-2.0.3.tar.bz2) = 2a0d9139d8d5dbea1a319c29577867c0044d713d34f56be6a03d363bf2cdc7b4 -SIZE (foreman-proxy-2.0.3.tar.bz2) = 210662 +TIMESTAMP = 1619297779 +SHA256 (foreman-proxy-2.1.4.tar.bz2) = 05e187fe352e02b0829b7b83624433e7a012e93712151e4859ba8e53a6cf154e +SIZE (foreman-proxy-2.1.4.tar.bz2) = 209030 diff --git a/net/foreman-proxy/files/patch-bin-smart-proxy b/net/foreman-proxy/files/patch-bin-smart-proxy index d85df17df24c..3df6da1863db 100644 --- a/net/foreman-proxy/files/patch-bin-smart-proxy +++ b/net/foreman-proxy/files/patch-bin-smart-proxy @@ -3,7 +3,7 @@ @@ -1,6 +1,7 @@ #!/usr/bin/env ruby - $LOAD_PATH.unshift(*Dir[File.expand_path("../../lib", __FILE__), File.expand_path("../../modules", __FILE__)]) + $LOAD_PATH.unshift(*Dir[File.expand_path('../lib', __dir__), File.expand_path('../modules', __dir__)]) +$LOAD_PATH.unshift(*Dir["%%DATADIR%%/lib", "%%DATADIR%%/modules"]) require 'smart_proxy_main' diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist index 28c3af5790f0..0816b4d69748 100644 --- a/net/foreman-proxy/pkg-plist +++ b/net/foreman-proxy/pkg-plist @@ -59,9 +59,8 @@ sbin/smart-proxy %%DATADIR%%/extra/migrations/2018062000000_migrate_puppetca_settings.rb %%DATADIR%%/extra/migrations/20181016000000_migrate_puppetca_puppet_cert_settings.rb %%DATADIR%%/extra/query.rb -%%DATADIR%%/extra/register-service.rb +%%DATADIR%%/extra/register_service.rb %%DATADIR%%/lib/bundler_helper.rb -%%DATADIR%%/lib/hash-patch.rb %%DATADIR%%/lib/launcher.rb %%DATADIR%%/lib/proxy/default_di_wirings.rb %%DATADIR%%/lib/proxy/default_plugin_validators.rb @@ -100,7 +99,6 @@ sbin/smart-proxy %%DATADIR%%/lib/smart_proxy.rb %%DATADIR%%/lib/smart_proxy_for_testing.rb %%DATADIR%%/lib/smart_proxy_main.rb -%%DATADIR%%/lib/webrick-patch.rb %%DATADIR%%/modules/bmc/base.rb %%DATADIR%%/modules/bmc/bmc.rb %%DATADIR%%/modules/bmc/bmc_api.rb @@ -120,8 +118,6 @@ sbin/smart-proxy %%DATADIR%%/modules/dhcp_common/isc/configuration_parser.rb %%DATADIR%%/modules/dhcp_common/isc/omapi_provider.rb %%DATADIR%%/modules/dhcp_common/isc/subnet_service_initialization.rb -%%DATADIR%%/modules/dhcp_common/monkey_patch_subnet.rb -%%DATADIR%%/modules/dhcp_common/monkey_patches.rb %%DATADIR%%/modules/dhcp_common/pingable.rb %%DATADIR%%/modules/dhcp_common/record.rb %%DATADIR%%/modules/dhcp_common/record/deleted_reservation.rb @@ -191,7 +187,6 @@ sbin/smart-proxy %%DATADIR%%/modules/puppet_proxy/puppet_api.rb %%DATADIR%%/modules/puppet_proxy/puppet_plugin.rb %%DATADIR%%/modules/puppet_proxy_common/api_request.rb -%%DATADIR%%/modules/puppet_proxy_common/custom_validators.rb %%DATADIR%%/modules/puppet_proxy_common/environment.rb %%DATADIR%%/modules/puppet_proxy_common/environments_retriever_base.rb %%DATADIR%%/modules/puppet_proxy_common/errors.rb