Page MenuHomeFreeBSD
Files F148457647

D38754.id117856.diff
No OneTemporary
Actions

D38754.id117856.diff
View Options

Index: sysutils/debootstrap/Makefile
===================================================================
--- sysutils/debootstrap/Makefile
+++ sysutils/debootstrap/Makefile
@@ -1,5 +1,5 @@
PORTNAME= debootstrap
-PORTVERSION= ${DEB_VERSION}-${DEB_NMU}
+PORTVERSION= ${DEB_VERSION}n${DEB_NMU}
CATEGORIES= sysutils
MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${DEB_VERSION}+nmu${DEB_NMU}
@@ -20,6 +20,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
NO_BUILD= yes
NO_ARCH= yes
+MAKE_ENV= DATADIR="${DATADIR}"
USES= gmake perl5
USE_PERL5= run
@@ -30,18 +31,11 @@
post-patch:
@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
- ${WRKSRC}/Makefile \
${WRKSRC}/debootstrap
@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},g' \
- ${WRKSRC}/Makefile \
${WRKSRC}/debootstrap
@${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'
Index: sysutils/debootstrap/files/patch-Makefile
===================================================================
--- sysutils/debootstrap/files/patch-Makefile
+++ sysutils/debootstrap/files/patch-Makefile
@@ -5,7 +5,7 @@
clean:
-DSDIR=$(DESTDIR)/usr/share/debootstrap
-+DSDIR=$(DESTDIR)$(PREFIX)/share/debootstrap
++DSDIR=$(DESTDIR)$(DATADIR)
install:
mkdir -p $(DSDIR)/scripts
- mkdir -p $(DESTDIR)/usr/sbin
Index: sysutils/debootstrap/files/patch-debootstrap
===================================================================
--- sysutils/debootstrap/files/patch-debootstrap
+++ sysutils/debootstrap/files/patch-debootstrap
@@ -11,7 +11,7 @@
DEBOOTSTRAP_DIR=/debootstrap
else
- DEBOOTSTRAP_DIR=/usr/share/debootstrap
-+ DEBOOTSTRAP_DIR=/usr/local/share/debootstrap
++ DEBOOTSTRAP_DIR=%%DATADIR%%
fi
fi
Index: sysutils/debootstrap/files/patch-functions
===================================================================
--- /dev/null
+++ sysutils/debootstrap/files/patch-functions
@@ -0,0 +1,20 @@
+--- functions.orig 2023-02-24 08:27:34 UTC
++++ functions
+@@ -658,7 +658,7 @@ download_release_sig () {
+ info RELEASESIG "Checking Release signature"
+ # Don't worry about the exit status from gpgv; parsing the output will
+ # take care of that.
+- (gpgv --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict \
++ (gpgv2 --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict \
+ "$relsigdest" "$reldest" || true) | read_gpg_status
+ progress 100 100 DOWNRELSIG "Downloading Release file signature"
+ fi
+@@ -1706,7 +1706,7 @@ read_gpg_status () {
+ elif [ "$unkkey" ]; then
+ error 1 UNKNOWNRELSIG "Release signed by unknown key (key id %s)\n The specified keyring $KEYRING may be incorrect or out of date.\n You can find the latest Debian release key at https://ftp-master.debian.org/keys.html" "$unkkey"
+ else
+- error 1 SIGCHECK "Error executing gpgv to check Release signature"
++ error 1 SIGCHECK "Error executing gpgv2 to check Release signature"
+ fi
+ }
+

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 19, 12:45 AM (2 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29935565
Default Alt Text
D38754.id117856.diff (3 KB)

Event Timeline