From 152a5bedeba947336f3022f2b6704e0c415b47ea Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 13 Jan 2023 21:14:47 +0100
Subject: core/pkgutils: adapt patches

---
 core/pkgutils/Pkgfile-apply-patch1.patch       | 8 ++++----
 core/pkgutils/Pkgfile-apply-patch2.patch       | 6 +++---
 core/pkgutils/pkgmk-permissions-test.patch.new | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'core')

diff --git a/core/pkgutils/Pkgfile-apply-patch1.patch b/core/pkgutils/Pkgfile-apply-patch1.patch
index 94f47fa..ccc40d8 100644
--- a/core/pkgutils/Pkgfile-apply-patch1.patch
+++ b/core/pkgutils/Pkgfile-apply-patch1.patch
@@ -2,10 +2,10 @@
 +++ Pkgfile	2016-06-01 21:50:47.785297105 +0200
 @@ -6,9 +6,11 @@
  name=pkgutils
- version=5.40.1
- release=1
--source=(http://crux.nu/files/$name-$version.tar.xz)
-+source=(http://crux.nu/files/$name-$version.tar.xz
+ version=5.40.9
+ release=2
+-source=(https://crux.nu/files/$name-$version.tar.xz)
++source=(https://crux.nu/files/$name-$version.tar.xz
 +	PKGMK_FULL_SOURCE_MIRRORS.patch)
  
  build () {
diff --git a/core/pkgutils/Pkgfile-apply-patch2.patch b/core/pkgutils/Pkgfile-apply-patch2.patch
index d8cddeb..b11c206 100644
--- a/core/pkgutils/Pkgfile-apply-patch2.patch
+++ b/core/pkgutils/Pkgfile-apply-patch2.patch
@@ -1,9 +1,9 @@
 --- Pkgfile	2016-06-01 21:50:22.035228588 +0200
 +++ Pkgfile	2016-06-01 21:50:47.785297105 +0200
 @@ -7,10 +7,12 @@
- version=5.40.1
- release=1
- source=(http://crux.nu/files/$name-$version.tar.xz
+ version=5.40.9
+ release=2
+ source=(https://crux.nu/files/$name-$version.tar.xz
 -	PKGMK_FULL_SOURCE_MIRRORS.patch)
 +	PKGMK_FULL_SOURCE_MIRRORS.patch
 +	pkgmk-permissions-test.patch)
diff --git a/core/pkgutils/pkgmk-permissions-test.patch.new b/core/pkgutils/pkgmk-permissions-test.patch.new
index d94705a..870f0f5 100644
--- a/core/pkgutils/pkgmk-permissions-test.patch.new
+++ b/core/pkgutils/pkgmk-permissions-test.patch.new
@@ -16,7 +16,7 @@
  
  	PKGMK_DOWNLOAD_PROG=${PKGMK_DOWNLOAD_PROG:-wget}
 @@ -631,10 +636,13 @@
- 	local FILE LOCAL_FILENAME
+ 	local ORIG_FILE LOCAL_FILE srcind
  
  	if [ -f $TARGET ]; then
 +		check_directory "$PKGMK_PACKAGE_DIR"
@@ -26,9 +26,9 @@
  
 +	check_directory "$PKGMK_SOURCE_DIR"
 +
- 	for FILE in ${source[@]}; do
- 		LOCAL_FILENAME=`get_filename $FILE`
- 		if [ -e $LOCAL_FILENAME ] && [ "$LOCAL_FILENAME" != "$FILE" ]; then
+ 	srcind=0
+ 	while [ $srcind -lt ${#source[@]} ]; do
+ 		ORIG_FILE="${source[$srcind]}"
 @@ -652,7 +660,6 @@
  
  	check_file "$PKGMK_FOOTPRINT"
-- 
cgit v1.2.3-54-g00ecf