From owner-svn-ports-head@freebsd.org Sat Mar 13 11:23:03 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 359B8573B8D; Sat, 13 Mar 2021 11:23:03 +0000 (UTC) (envelope-from trasz@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 4DyKzq10b7z4km7; Sat, 13 Mar 2021 11:23:03 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 154421868; Sat, 13 Mar 2021 11:23:03 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12DBN2RL036872; Sat, 13 Mar 2021 11:23:02 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12DBN29L036870; Sat, 13 Mar 2021 11:23:02 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202103131123.12DBN29L036870@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 13 Mar 2021 11:23:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568244 - head/sysutils/debootstrap X-SVN-Group: ports-head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/sysutils/debootstrap X-SVN-Commit-Revision: 568244 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Mar 2021 11:23:03 -0000 Author: trasz Date: Sat Mar 13 11:23:02 2021 New Revision: 568244 URL: https://svnweb.freebsd.org/changeset/ports/568244 Log: sysutils/debootstrap: make it work without --no-check-gpg Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29231 Modified: head/sysutils/debootstrap/Makefile head/sysutils/debootstrap/pkg-message Modified: head/sysutils/debootstrap/Makefile ============================================================================== --- head/sysutils/debootstrap/Makefile Sat Mar 13 11:06:46 2021 (r568243) +++ head/sysutils/debootstrap/Makefile Sat Mar 13 11:23:02 2021 (r568244) @@ -3,9 +3,9 @@ PORTNAME= debootstrap PORTVERSION= 1.0.123 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils -MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME} +MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= trasz@FreeBSD.org @@ -15,7 +15,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/debian/copyright RUN_DEPENDS= wget:ftp/wget \ - bash:shells/bash + bash:shells/bash \ + gpgv2:security/gnupg \ + ${LOCALBASE}/share/keyrings/ubuntu-archive-keyring.gpg:security/ubuntu-keyring WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes @@ -33,6 +35,12 @@ post-patch: @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ ${WRKSRC}/Makefile \ ${WRKSRC}/debootstrap + @${REINPLACE_CMD} -e 's,gpgv,gpgv2,g' \ + ${WRKSRC}/Makefile \ + ${WRKSRC}/debootstrap \ + ${WRKSRC}/functions + @${FIND} ${WRKSRC}/scripts -type f | \ + ${XARGS} ${REINPLACE_CMD} -e 's,/usr/share/keyrings,${LOCALBASE}/share/keyrings,g' post-install: ${INSTALL_MAN} ${WRKSRC}/debootstrap.8 \ Modified: head/sysutils/debootstrap/pkg-message ============================================================================== --- head/sysutils/debootstrap/pkg-message Sat Mar 13 11:06:46 2021 (r568243) +++ head/sysutils/debootstrap/pkg-message Sat Mar 13 11:23:02 2021 (r568244) @@ -6,9 +6,9 @@ debootstrap requires the following kernel modules to b linux64 fdescfs linprocfs linsysfs tmpfs -To install Ubuntu Bionic into /compat/ubuntu, use: +To install Ubuntu 18.04 LTS (Bionic Beaver) into /compat/ubuntu, run as root: -debootstrap --no-check-gpg bionic /compat/ubuntu +debootstrap bionic /compat/ubuntu EOM } ]