From 1c450189a7b9a634e58d0e4cac93217fb48a1170 Mon Sep 17 00:00:00 2001 From: Victor Tebar Date: Fri, 6 May 2022 14:27:06 +0200 Subject: [PATCH 1/4] New package: devour-11.1 --- srcpkgs/devour/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/devour/template diff --git a/srcpkgs/devour/template b/srcpkgs/devour/template new file mode 100644 index 000000000000..693217ea7b8b --- /dev/null +++ b/srcpkgs/devour/template @@ -0,0 +1,13 @@ +# Template file for 'devour' +pkgname=devour +version=11.1 +revision=1 +build_style=gnu-makefile +hostmakedepends="pkgconf xdo" +makedepends="libX11-devel" +short_desc="terminal swallower" +maintainer="Visone Selektah " +license="GPL-2.0-or-later" +homepage="https://github.com/Visone-Selektah/devour" +distfiles="https://github.com/Visone-Selektah/devour/archive/refs/tags/${version}.tar.gz" +checksum=dad4b0b6585f7c6fbefaa9579bde88ea1f25e07ee168e4bebc4e61ca1c621db4 From 83a07c0279aa3a5d9789c1f79232507b2d1b17c1 Mon Sep 17 00:00:00 2001 From: Victor Tebar Date: Sat, 7 May 2022 09:16:09 +0200 Subject: [PATCH 2/4] devour: Fix typo and remove xdo --- srcpkgs/devour/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/devour/template b/srcpkgs/devour/template index 693217ea7b8b..28e72aa8bb3b 100644 --- a/srcpkgs/devour/template +++ b/srcpkgs/devour/template @@ -3,9 +3,9 @@ pkgname=devour version=11.1 revision=1 build_style=gnu-makefile -hostmakedepends="pkgconf xdo" +hostmakedepends="pkgconf" makedepends="libX11-devel" -short_desc="terminal swallower" +short_desc="Terminal swallower" maintainer="Visone Selektah " license="GPL-2.0-or-later" homepage="https://github.com/Visone-Selektah/devour" From 518aae1076210592243376f659c16a27fbe8013e Mon Sep 17 00:00:00 2001 From: Victor Tebar Date: Sun, 8 May 2022 19:18:45 +0200 Subject: [PATCH 3/4] Change distfiles to upstream & add patches --- srcpkgs/devour/patches/devour-makefile.diff | 32 +++++++++++++++++++ .../patches/devour-shellalias-10.0.diff | 18 +++++++++++ srcpkgs/devour/template | 10 +++--- 3 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/devour/patches/devour-makefile.diff create mode 100644 srcpkgs/devour/patches/devour-shellalias-10.0.diff diff --git a/srcpkgs/devour/patches/devour-makefile.diff b/srcpkgs/devour/patches/devour-makefile.diff new file mode 100644 index 000000000000..cb3a1c1f4787 --- /dev/null +++ b/srcpkgs/devour/patches/devour-makefile.diff @@ -0,0 +1,32 @@ +--- Makefile ++++ patches/Makefile +@@ -6,21 +6,21 @@ + CC = cc + CFLAGS = -std=c11 -D_POSIX_C_SOURCE=200809L -Wall -Wextra -pedantic -O2 + LDLIBS = -s -lX11 ++PREFIX = /usr + +-BIN_DIR = /usr/local/bin +- + SRC = devour.c + OBJ = devour.o + + all: $(NAME) + $(NAME): $(OBJ) + install: all +- @mkdir -p $(BIN_DIR) +- @mv $(NAME) $(BIN_DIR) +- @rm -f $(OBJ) +- @echo Done moving the binary to ${DESTDIR}${BIN_DIR} ++ @mkdir -p ${DESTDIR}${PREFIX}/bin ++ @mv devour ${DESTDIR}${PREFIX}/bin ++ @rm -f ${OBJ} ++ @echo Done installing executable files to ${DESTDIR}${PREFIX}/bin ++ + uninstall: +- @rm -f $(BIN_DIR)/$(NAME) +- @echo Done removing the binary from $(BIN_DIR) ++ @rm -f ${DESTDIR}${PREFIX}/bin/devour ++ @echo Done removing executable files from ${DESTDIR}${PREFIX}/bin + + .PHONY: all install uninstall diff --git a/srcpkgs/devour/patches/devour-shellalias-10.0.diff b/srcpkgs/devour/patches/devour-shellalias-10.0.diff new file mode 100644 index 000000000000..e79365f7dd2f --- /dev/null +++ b/srcpkgs/devour/patches/devour-shellalias-10.0.diff @@ -0,0 +1,18 @@ +--- devour.c ++++ patches/devour.c +@@ -14,6 +14,7 @@ + char *arg; + char cmd[1024] = {0}; + ++ strcat(cmd, "$SHELL -i -c '"); + while ((arg = *++argv)) { + while ((arg_char = *arg++)) { + if (strchr(UNSAFE_CHARS, arg_char)) +@@ -22,6 +23,7 @@ + } + strcat(cmd, " "); + } ++ strcat(cmd, "> /dev/null 2>&1; exit'"); + system(cmd); + } + diff --git a/srcpkgs/devour/template b/srcpkgs/devour/template index 28e72aa8bb3b..8fba8273adaf 100644 --- a/srcpkgs/devour/template +++ b/srcpkgs/devour/template @@ -1,13 +1,13 @@ # Template file for 'devour' pkgname=devour -version=11.1 +version=12 revision=1 build_style=gnu-makefile -hostmakedepends="pkgconf" +hostmakedepends="pkg-config" makedepends="libX11-devel" short_desc="Terminal swallower" maintainer="Visone Selektah " license="GPL-2.0-or-later" -homepage="https://github.com/Visone-Selektah/devour" -distfiles="https://github.com/Visone-Selektah/devour/archive/refs/tags/${version}.tar.gz" -checksum=dad4b0b6585f7c6fbefaa9579bde88ea1f25e07ee168e4bebc4e61ca1c621db4 +homepage="https://github.com/salman-abedin/devour" +distfiles="https://github.com/salman-abedin/devour/archive/refs/tags/${version}.tar.gz" +checksum=5e9ddfee23d33557ba0b72affed6816d7b66ff06ef00aecdf0813b32f09b6eb4 From 8eb20c8025fcc92ffbf2805c1e8fd20926a3417a Mon Sep 17 00:00:00 2001 From: Victor Tebar Date: Sun, 8 May 2022 22:20:55 +0200 Subject: [PATCH 4/4] devour: update to 12 --- srcpkgs/devour/patches/devour-makefile.diff | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/devour/patches/devour-makefile.diff b/srcpkgs/devour/patches/devour-makefile.diff index cb3a1c1f4787..043f1e84c968 100644 --- a/srcpkgs/devour/patches/devour-makefile.diff +++ b/srcpkgs/devour/patches/devour-makefile.diff @@ -1,6 +1,12 @@ --- Makefile -+++ patches/Makefile -@@ -6,21 +6,21 @@ ++++ 12/Makefile +@@ -1,26 +1,26 @@ + .POSIX: + + NAME = devour +-VERSION = 11.0 ++VERSION = 12.0 + CC = cc CFLAGS = -std=c11 -D_POSIX_C_SOURCE=200809L -Wall -Wextra -pedantic -O2 LDLIBS = -s -lX11