From nobody Wed May 28 08:41:49 2025 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 4b6jfP4fDRz5x9t6; Wed, 28 May 2025 08:41:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6jfP3xN1z3lrl; Wed, 28 May 2025 08:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748421709; 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=lShjLlAc+FUjIj2X9hX0bTW8CSNipDU+fE01RpHe1UE=; b=UNN8cvZXmayW8bt4KdrCAbhXqnoVQV4wSXLYVR97IKv+Af1gAf/RP6XBJX054DgKbvhNmH Ty3PbrvcpqKKNd+hxLSW71PLVKRkIOr6xGfOZ8a7yLAfoADBujMS5uRwFx/SaKRTQROJHM CvL2ZCFElDtiE4xL296erlpKdPkdSdxisHuDF/GINcAV2BmX5cnbmNz/hC7kWs7KhJpH1+ BsK6HrsWLjfgSU6WIkIy6HEi5ICDkYZmJQhgK8+szwOT5p/BFT1O+ONLoqLYiTDviIzYdJ ZY+VUJ5mkNo1+5v+VaxU86JNppwKF5AiPL7KH/DK7jNhgLeFiPvSp02UQZvP4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748421709; a=rsa-sha256; cv=none; b=gyZVmICh4pQl5yEWVQ4CAxokh5tnavt/T/dW/ORs4qd6TBQdxm4bejgLmlfRoElUwZExEn 441F5IGUIX74XtZdjSUHN45jYz6sErwo7BGRzisM6fgUiWk6vRXnOTFxQPuHuoWiwfGXG5 wdW9z6KNKb2ZAlXNQZq1Jy5xkAQKkVhPoRFx82E8RCdsO2Fr1VjWDTdmCgcxjAUJS2WWDC riuoPhzLf2Lqf7CSluIbdeiZMqnmCGFTC5fPmIDmSFjEfcDYzgcuADg9DbfGV1Ge7P28KL z9NbiuX6l/f4DXfdv92o2NTWas6GlM6LIWqdoYsNJtKnxTKzTbBHP39qgNblww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748421709; 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=lShjLlAc+FUjIj2X9hX0bTW8CSNipDU+fE01RpHe1UE=; b=Fp0t8fYebsGB8lJhZebhbCoondjsA0HmbTnJUTby8YZt4vIDOauCON89Kax5VERpeCfa0X P8QoePxYEz+PNt+0bBfO8ZfAr/s2fwMz3n63PqgvnsWC8YQx7MsSZmx9K8Z5zPvoR1sESg TqWzuInsnGB1Ws2l89aOFHKai9x8yky0qizBC1CCUVPC/vcHtnFm2gYao1/weofQQ1OLxE +gcyUfdUWiXvRV3UuFouCMUpLWJH4XVM9McqTbjXw4/sycnJD+OOITGn4BRr5/xjuPyKY2 t/m5GkIeuIV8Y03xbXIwqxKt5vgtZQTYB0R9Qj1H77qY9BLjsnwpyYHMoWdejQ== 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 4b6jfP3XJ0zVs7; Wed, 28 May 2025 08:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54S8fnsF070473; Wed, 28 May 2025 08:41:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S8fnwd070470; Wed, 28 May 2025 08:41:49 GMT (envelope-from git) Date: Wed, 28 May 2025 08:41:49 GMT Message-Id: <202505280841.54S8fnwd070470@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 076249c79910 - main - dns/dnsmasq-devel: Revise files/update.py script. 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 076249c799105fe08a1a2a090be5104e897ae3b4 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=076249c799105fe08a1a2a090be5104e897ae3b4 commit 076249c799105fe08a1a2a090be5104e897ae3b4 Author: Matthias Andree AuthorDate: 2025-05-28 08:41:24 +0000 Commit: Matthias Andree CommitDate: 2025-05-28 08:41:48 +0000 dns/dnsmasq-devel: Revise files/update.py script. --- dns/dnsmasq-devel/files/update.py | 41 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dns/dnsmasq-devel/files/update.py b/dns/dnsmasq-devel/files/update.py index 5657cd9bc06d..df81cdd3880b 100755 --- a/dns/dnsmasq-devel/files/update.py +++ b/dns/dnsmasq-devel/files/update.py @@ -1,13 +1,11 @@ #!/usr/bin/env python3 """update.py for dnsmasq-devel - (C) 2025 Matthias Andree, placed under MIT license -To use, edit Makefile with the new version and possibly URLBASE below when switching to release-candidates, -then run python update.py, which will download, check sigs, if GnuPG checks out, update makesum, +To use, edit Makefile with the new version, +then run files/update.py, which will download, check sigs, if GnuPG checks out, update makesum, upload tarball and sig to my public_distfiles/ because upstream has low bandwidth, and test build. If things work out, commit manually and push.""" -URLBASE = 'https://www.thekelleys.org.uk/dnsmasq/test-releases/' - import os import shutil import subprocess @@ -15,25 +13,28 @@ import sys def trace(func): def wrapper(*args, **kwargs): - print(f"> {func.__name__}({args}, {kwargs})", file=sys.stderr) + print(f"\n> {func.__name__}({args}, {kwargs})", file=sys.stderr) retval = func(*args, **kwargs) print(f"< {func.__name__} -> {retval!r}", file=sys.stderr) return retval return wrapper -subprocess.run = trace(subprocess.run) +traced_run = trace(subprocess.run) + +cleanenv={'LC_ALL': 'C.UTF-8', + 'PATH': os.environ["PATH"]} +defargs={"check": "True", "env": cleanenv, "encoding": 'UTF-8'} -completed_distname = subprocess.run('make -V DISTNAME'.split(), capture_output=True, check=True, env={"LC_ALL": "C.UTF-8", "PATH": f'{os.environ["PATH"]}'}, encoding='UTF-8') -name = completed_distname.stdout.splitlines()[0].strip() -fnt = name + '.tar.xz' -fns = fnt + '.asc' -urt = URLBASE + fnt -urs = URLBASE + fns -subprocess.run(['fetch', urt, urs], check=True) -subprocess.run(['gpg', '--verify', fns, fnt], check=True) -subprocess.run(['rsync', '-avHP', '--chmod=0644', fnt, fns, 'freefall.freebsd.org:public_distfiles/'], check=True) -shutil.move(fnt, '/usr/ports/distfiles/' + fnt) -os.remove(fns) -subprocess.run(['make', 'makesum'], check=True) -subprocess.run(['make', 'clean'], check=True) -subprocess.run(['make', 'check-plist', 'package'], check=True) +distdir, master_site = map(str.strip, traced_run(['make', '-V', 'DISTDIR', '-V', 'MASTER_SITES:N*FreeBSD*'], capture_output=True, **defargs).stdout.splitlines()) +filename_tarball = traced_run('make -V DISTFILES'.split(), capture_output=True, **defargs).stdout.splitlines()[0].strip() +filename_signature = filename_tarball + '.asc' +uri_tarball = master_site + filename_tarball +uri_signature = master_site + filename_signature +traced_run(['fetch', uri_tarball, uri_signature], **defargs) +traced_run(['gpg', '--verify', filename_signature, filename_tarball], **defargs) +traced_run(['rsync', '-avHPW', '--chmod=0644', filename_tarball, filename_signature, 'freefall.freebsd.org:public_distfiles/'], **defargs) +shutil.move(filename_tarball, '/usr/ports/distfiles/' + filename_tarball) +os.remove(filename_signature) +traced_run(['make', 'makesum', 'clean'], **defargs) +traced_run(['make', 'check-plist', 'package'], **defargs) +print("\nSUCCESS\n")