logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: ca3231d9588dc7bc41ad032211d44ff2f581a098
parent 5dfe015e82b2e6190a706ca58ca055581b071c03
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 31 Jan 2020 20:55:47 -0800

blind: Remove patch no longer needed with the latest cproc

Diffstat:

M.gitmodules1-
Dpkg/blind/patch/0001-Use-malloc-instead-of-alloca.patch35-----------------------------------
Mpkg/blind/ver2+-
3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/.gitmodules b/.gitmodules @@ -20,7 +20,6 @@ [submodule "pkg/blind/src"] path = pkg/blind/src url = git://git.suckless.org/blind - ignore = all [submodule "pkg/bzip2/src"] path = pkg/bzip2/src url = git://sourceware.org/git/bzip2.git diff --git a/pkg/blind/patch/0001-Use-malloc-instead-of-alloca.patch b/pkg/blind/patch/0001-Use-malloc-instead-of-alloca.patch @@ -1,35 +0,0 @@ -From 17e5acf6ce56870838bef5235fdb381d7e6d7327 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Sat, 1 Jun 2019 14:57:42 -0700 -Subject: [PATCH] Use malloc instead of alloca - ---- - src/blind-split.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/blind-split.c b/src/blind-split.c -index e92fced..201fb6e 100644 ---- a/src/blind-split.c -+++ b/src/blind-split.c -@@ -2,7 +2,6 @@ - #include "stream.h" - #include "util.h" - --#include <alloca.h> - #include <fcntl.h> - #include <inttypes.h> - #include <limits.h> -@@ -38,8 +37,8 @@ main(int argc, char *argv[]) - eprintf("%s: video is too large\n", stream.file); - - parts = (size_t)argc / 2; -- ends = alloca(parts * sizeof(*ends)); -- to_end = alloca(parts); -+ ends = emalloc(parts * sizeof(*ends)); -+ to_end = emalloc(parts); - - for (i = 0; i < parts; i++) { - to_end[i] = 0; --- -2.20.1 - diff --git a/pkg/blind/ver b/pkg/blind/ver @@ -1 +1 @@ -1.1 r1 +1.1 r2