From nobody Fri Feb 24 06:54:49 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 4PNLHF2WP5z3tcMy; Fri, 24 Feb 2023 06:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PNLHF22M7z4lLm; Fri, 24 Feb 2023 06:54:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677221689; 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=B1Ila6BrF05itoR3Hyr268NnNyPumn/louIn3DEabSU=; b=WIBfRORRLFIHjIXDC78KO/06mfmLauZkrVHl8/zXO9XxbExhNcYcyg1H3+EZcJFicNUP8P 7Lix+bSb2k9U4UU2n2Cvb2j0fAYFIB3SHHEMuVHJSkCUGHKA92uOCFW9LMNa3HNieems3m 56akwGtfqsXtnlU/UH5iZ13KeLyKr1KlLu4b9JtCgctP7+6Prgag8Z2HDS//Y9KqWNLoV1 +JVO6WgAU6H0pNCY9irOlLwA0XjFnLnoib0c8Hzu49fzPyeZ6oB4BwlTs9tR7A9PWHn7H2 Vuc1lsJbfRUmkqGjKy83pfLlLcPHC8F6wZ71YqcU8YbrtMqCbgF2O8MCHh+vfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677221689; 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=B1Ila6BrF05itoR3Hyr268NnNyPumn/louIn3DEabSU=; b=WUQSIZPe7qdRhv+hB0CaXC3+j+QE+APXIr1AlbT04Jb2C4o/+iLTKaKYs5sSKWafzPXlpu XQ7mzFvyf9xTgTAnqAc6l5+CkgkIcPCEJnZST943/Sjq30Z9D6eMuYH365yvzTX3u4F+hA 19/cyMuu9D8lH8y2J6vJPbMn412Zx2qlUTYPeRb9Q709lG4CIWYR420MD6zC1zIhUK6piz XidY/ZniSUWK7p5vT92vpxrIFZwp3UhbrBRRYSDYJ/I0qGwyZ0u8tZmCU3jLKX0lTUmtOM 1z+BrVLHikFeDNPB41K8NB7M2vfBf9l9SdjqQ9WN4Tdujld1WgncWlY3L8YdQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677221689; a=rsa-sha256; cv=none; b=hbAM6M/YYAL2IN0/M26l5Lp+H9sW41iakBCv7fIBlwbqjWPDYtCM9QpjcdhwqNjlT5SjbX VCdNvH+ldfowQjiRBRJ1epOdWTDF8sQnoonfuNc9QDQ/xKDns3brDAiYgO9WMUD5drb8NZ ZT8g394Bic9fstTBNzp0iG5aOCD9K9ZtBMemSb9kjj1Z9WsSHgVgwA8atpNVbelYZ/FzCh rmgWrj9mD0UYNvUooBKloe8UH9eEu7PuTteK9DOceH9BjkMl2UfruE0AdiQaPrJ4TXoXTj b2gTxYfDHPalmkChy3qndWEXbHlXIrZ6J1ZhzYlkMtCtvfVx/vSrNO3LJY3L4A== 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 4PNLHF0zLXzDxq; Fri, 24 Feb 2023 06:54:49 +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 31O6snAC090284; Fri, 24 Feb 2023 06:54:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31O6snaG090283; Fri, 24 Feb 2023 06:54:49 GMT (envelope-from git) Date: Fri, 24 Feb 2023 06:54:49 GMT Message-Id: <202302240654.31O6snaG090283@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Felix Palmen Subject: git: 70c840348ab1 - 2023Q1 - sysutils/debootstrap: Update to 1.0.128-2 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: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 70c840348ab1af9e5e22237699792328f5527dfc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=70c840348ab1af9e5e22237699792328f5527dfc commit 70c840348ab1af9e5e22237699792328f5527dfc Author: Felix Palmen AuthorDate: 2023-02-19 07:33:33 +0000 Commit: Felix Palmen CommitDate: 2023-02-24 06:54:15 +0000 sysutils/debootstrap: Update to 1.0.128-2 For a debian-native package, a +nmuX version should be considered a new upstream version (it just means "non mantainer upload" there). Derive some PORTVERSION from that that's sane for our versioning. While here, eliminate hardcoded /usr/local from Makefile patch. Approved by: nc (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D38670 (cherry picked from commit 2bf4a73e61cd322efa426f55101afa25bd2481d3) --- sysutils/debootstrap/Makefile | 10 +++++++--- sysutils/debootstrap/distinfo | 6 +++--- sysutils/debootstrap/files/patch-Makefile | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile index 021a8c1c5538..fdb808e04908 100644 --- a/sysutils/debootstrap/Makefile +++ b/sysutils/debootstrap/Makefile @@ -1,9 +1,8 @@ PORTNAME= debootstrap -PORTVERSION= 1.0.128 -PORTREVISION= 1 +PORTVERSION= ${DEB_VERSION}-${DEB_NMU} CATEGORIES= sysutils MASTER_SITES= DEBIAN -DISTNAME= ${PORTNAME}_${PORTVERSION}+nmu2~bpo11+1 +DISTNAME= ${PORTNAME}_${DEB_VERSION}+nmu${DEB_NMU} MAINTAINER= nc@FreeBSD.org COMMENT= Install Debian or Ubuntu base system into a directory @@ -24,6 +23,11 @@ NO_ARCH= yes USES= gmake perl5 USE_PERL5= run +# The +nmu suffix used by debian for "non maintainer uploads" of a Debian +# native package doesn't play well with our versioning +DEB_VERSION= 1.0.128 +DEB_NMU= 2 + post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/Makefile \ diff --git a/sysutils/debootstrap/distinfo b/sysutils/debootstrap/distinfo index eff91678d5b2..54933414c156 100644 --- a/sysutils/debootstrap/distinfo +++ b/sysutils/debootstrap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677062129 -SHA256 (debootstrap_1.0.128+nmu2~bpo11+1.tar.gz) = 140b2ef281a190c70098462b090ba2997bbcd075a6c1a1c7ce90b4c0e10c207d -SIZE (debootstrap_1.0.128+nmu2~bpo11+1.tar.gz) = 82336 +TIMESTAMP = 1677148183 +SHA256 (debootstrap_1.0.128+nmu2.tar.gz) = 528523228d93a31c9e0cd4eb932977ea8ceec2bfbf8db1103bec2397cc7434fa +SIZE (debootstrap_1.0.128+nmu2.tar.gz) = 82266 diff --git a/sysutils/debootstrap/files/patch-Makefile b/sysutils/debootstrap/files/patch-Makefile index 79638ff023e8..8d55f3868d54 100644 --- a/sysutils/debootstrap/files/patch-Makefile +++ b/sysutils/debootstrap/files/patch-Makefile @@ -5,11 +5,11 @@ clean: -DSDIR=$(DESTDIR)/usr/share/debootstrap -+DSDIR=$(DESTDIR)/usr/local/share/debootstrap ++DSDIR=$(DESTDIR)$(PREFIX)/share/debootstrap install: mkdir -p $(DSDIR)/scripts - mkdir -p $(DESTDIR)/usr/sbin -+ mkdir -p $(DESTDIR)/usr/local/sbin ++ mkdir -p $(DESTDIR)$(PREFIX)/sbin cp -a scripts/* $(DSDIR)/scripts/ - install -o root -g root -m 0644 functions $(DSDIR)/ @@ -18,5 +18,5 @@ - sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap - chown root:root $(DESTDIR)/usr/sbin/debootstrap - chmod 0755 $(DESTDIR)/usr/sbin/debootstrap -+ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/local/sbin/debootstrap -+ chmod 0755 $(DESTDIR)/usr/local/sbin/debootstrap ++ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(PREFIX)/sbin/debootstrap ++ chmod 0755 $(DESTDIR)$(PREFIX)/sbin/debootstrap