Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-12 18:59:50 +03:00
Code Issues Wiki Activity

main/file: Import patch file instead of downloading it from GitHub

Browse source 
As noted by Celeste at [0], it's not recommended to use URL-based patches in
stable branches. Since the recently added patch is very small, we can simply
import it into the repository instead of downloading it.

Please note that the checksum has changed because the patch was downloaded with
the '?full_index=1' option.

[0]: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/77814#note_470256
This commit is contained in:
Moritz Haase 2025-01-02 09:27:18 +01:00
parent 5482d8c22c
commit e89c62d847
2 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
main/file/APKBUILD
View file

@ -2,14 +2,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=file
pkgver=5.46
pkgrel=1
pkgrel=2
pkgdesc="File type identification utility"
url="https://www.darwinsys.com/file/"
arch="all"
license="BSD-2-Clause"
subpackages="libmagic-static $pkgname-dev $pkgname-doc libmagic"
source="https://astron.com/pub/file/file-$pkgver.tar.gz
file-$pkgver-pr-579-net147-fix-stack-overrun.patch::https://github.com/file/file/commit/b3384a1fbfa1fee99986e5750ab8e700de4f24ad.patch
file-$pkgver-pr-579-net147-fix-stack-overrun.patch
"
# secfixes:
@ -50,5 +50,5 @@ libmagic() {
sha512sums="
a6cb7325c49fd4af159b7555bdd38149e48a5097207acbe5e36deb5b7493ad6ea94d703da6e0edece5bb32959581741f4213707e5cb0528cd46d75a97a5242dc file-5.46.tar.gz
76db2dd51fd164f5b62e6ca495c55adad9f7a19ef04a9316f5c3c963dd46592472b4e7d9fd084e0677400cb7f4a5814c682880470548c1bdb5bae551b6cad597 file-5.46-pr-579-net147-fix-stack-overrun.patch
bebada4d58c4b937f3c8a55e842402f3af334c2767652c8d1e1b1c2cc73f0b3125bdb4cf97265a4ec1f00d51a13d66b534ce2faa2103e463e6461e55736daf4d file-5.46-pr-579-net147-fix-stack-overrun.patch
"

31
main/file/file-5.46-pr-579-net147-fix-stack-overrun.patch Normal file
View file

@ -0,0 +1,31 @@
From b3384a1fbfa1fee99986e5750ab8e700de4f24ad Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Thu, 5 Dec 2024 18:35:40 +0000
Subject: [PATCH] PR/579: net147: Fix stack overrun.
---
src/readelf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/readelf.c b/src/readelf.c
index fe4cf54138955e1c19c6c48d324c0cc787a75eee..d209d86dfb5a29c2c6550227c65bfd28d0137ad2 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -27,7 +27,7 @@
#include "file.h"
#ifndef lint
-FILE_RCSID("@(#)$File: readelf.c,v 1.196 2024/11/11 15:49:11 christos Exp $")
+FILE_RCSID("@(#)$File: readelf.c,v 1.197 2024/12/05 18:35:40 christos Exp $")
#endif
#ifdef BUILTIN_ELF
@@ -1726,7 +1726,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
Elf64_Phdr ph64;
const char *linking_style;
unsigned char nbuf[NBUFSIZE];
- char interp[128];
+ char interp[NBUFSIZE];
ssize_t bufsize;
size_t offset, align, need = 0;
int pie = 0, dynamic = 0;