Attachment 240382 Details for Bug 269584 – [patch] fix more patching breakage fallout (v3)

[patch] [patch] fix more patching breakage fallout (v3)

pr-deboostrap-fix-hard-coded-usr-local-v3.diff (text/plain), 1.58 KB, created by John Hein on 2023-02-24 16:29:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2023-02-24 16:29:44 UTC

Size: 1.58 KB

patch

obsolete

>diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile
>index 47dcc65a4b85..c11afbe3aad3 100644
>--- a/sysutils/debootstrap/Makefile
>+++ b/sysutils/debootstrap/Makefile
>@@ -38,7 +38,7 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
> 		${WRKSRC}/Makefile \
> 		${WRKSRC}/debootstrap
>-	@${REINPLACE_CMD} -e 's,gpgv,gpgv2,g' \
>+	@${REINPLACE_CMD} -e 's,gpgv ,gpgv2 ,g' \
> 		${WRKSRC}/Makefile \
> 		${WRKSRC}/debootstrap \
> 		${WRKSRC}/functions
>diff --git a/sysutils/debootstrap/files/patch-debootstrap b/sysutils/debootstrap/files/patch-debootstrap
>index 82733b633193..3dbb2be99018 100644
>--- a/sysutils/debootstrap/files/patch-debootstrap
>+++ b/sysutils/debootstrap/files/patch-debootstrap
>@@ -2,7 +2,7 @@
> +++ debootstrap
> @@ -1,4 +1,4 @@
> -#!/bin/sh
>-+#!/usr/local/bin/bash
>++#!/usr/bin/env bash
>  set -e
>  
>  VERSION='@VERSION@'
>@@ -11,21 +11,10 @@
>  		DEBOOTSTRAP_DIR=/debootstrap
>  	else
> -		DEBOOTSTRAP_DIR=/usr/share/debootstrap
>-+		DEBOOTSTRAP_DIR=/usr/local/share/debootstrap
>++		DEBOOTSTRAP_DIR=%%PREFIX%%/share/debootstrap
>  	fi
>  fi
>  
>-@@ -379,8 +379,8 @@ if [ $# != 0 ] ; then
>- 		shift
>- 		;;
>- 	    --keyring|--keyring=?*)
>--		if ! gpgv --version >/dev/null 2>&1; then
>--			error 1 NEEDGPGV "gpgv not installed, but required for Release verification"
>-+		if ! gpgv2 --version >/dev/null 2>&1; then
>-+			error 1 NEEDGPGV "gpgv2 not installed, but required for Release verification"
>- 		fi
>- 		if [ "$1" = "--keyring" ] && [ -n "$2" ]; then
>- 			KEYRING="$2"
> @@ -536,13 +536,7 @@ fi
>  
>  ###########################################################################

Flags:

zirias: maintainer-approval-

Actions: View | Diff

Attachments on bug 269584: 240180 | 240215 | 240358 | 240382