Page MenuHomeFreeBSD
Files F163596144

D29231.id85688.diff
No OneTemporary
Actions

D29231.id85688.diff
View Options

Index: head/sysutils/debootstrap/Makefile
===================================================================
--- head/sysutils/debootstrap/Makefile
+++ head/sysutils/debootstrap/Makefile
@@ -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_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 @@
@${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 \
Index: head/sysutils/debootstrap/pkg-message
===================================================================
--- head/sysutils/debootstrap/pkg-message
+++ head/sysutils/debootstrap/pkg-message
@@ -6,9 +6,9 @@
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
}
]

File Metadata

Mime Type
text/plain
Expires
Sat, Jul 25, 8:11 PM (19 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35486790
Default Alt Text
D29231.id85688.diff (1 KB)

Event Timeline