From 014c8e5b3fa92b4df0194c6deb109662be8cfd5d Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@termux.org>
Date: Fri, 11 Mar 2022 13:01:24 +0100
Subject: [PATCH] electric-fence: update to 2.2.6

---
 packages/electric-fence/Makefile.patch | 35 +++++++++++++-------------
 packages/electric-fence/build.sh       |  5 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/electric-fence/Makefile.patch b/packages/electric-fence/Makefile.patch
index 82cb78d8d..5247b1876 100644
--- a/packages/electric-fence/Makefile.patch
+++ b/packages/electric-fence/Makefile.patch
@@ -1,8 +1,6 @@
-diff --git a/../electric-fence/Makefile b/./Makefile
-index 4e0dd5b6c..4c26431e1 100644
---- a/../electric-fence/Makefile
-+++ b/./Makefile
-@@ -1,19 +1,12 @@
+--- ./Makefile.orig	2021-11-12 18:58:14.000000000 +0000
++++ ./Makefile	2022-03-11 12:00:02.007006320 +0000
+@@ -1,19 +1,15 @@
 -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 -       CFLAGS=-O0 -fno-builtin-malloc -g -Wall -DUSE_SEMAPHORE -fPIC
 -else
@@ -12,19 +10,21 @@ index 4e0dd5b6c..4c26431e1 100644
  
  LIBS= -lpthread
  
--prefix=/usr
+-prefix=$(DESTDIR)/usr
++prefix?=$(DESTDIR)/usr
  BIN_INSTALL_DIR= $(prefix)/bin
  LIB_INSTALL_DIR= $(prefix)/lib
--MAN_INSTALL_DIR= $(prefix)/man/man3
-+MAN_INSTALL_DIR= $(prefix)/share/man/man3
+ MAN_INSTALL_DIR= $(prefix)/share/man/man3
  
  
 -CC= cc
 -AR= ar
++CC?= cc
++AR?= ar
  INSTALL= install
  
  PACKAGE_SOURCE= README efence.3 Makefile efence.h \
-@@ -21,25 +14,17 @@ PACKAGE_SOURCE= README efence.3 Makefile efence.h \
+@@ -21,18 +17,10 @@
  
  OBJECTS= efence.o page.o print.o
  
@@ -40,20 +40,21 @@ index 4e0dd5b6c..4c26431e1 100644
 +all:	libefence.a libefence.so.0.0
  
  install: libefence.a libefence.3 libefence.so.0.0
--	$(INSTALL) -m 755 ef.sh $(BIN_INSTALL_DIR)/ef
+-#	$(INSTALL) -m 755 ef.sh $(BIN_INSTALL_DIR)/ef
 +	$(INSTALL) -m 755 $(TERMUX_PKG_BUILDER_DIR)/ef.sh $(BIN_INSTALL_DIR)/ef
- 	$(INSTALL) -m 644 libefence.a $(LIB_INSTALL_DIR)
- 	$(INSTALL) -m 755 libefence.so.0.0 $(LIB_INSTALL_DIR)
- 	- rm -f $(LIB_INSTALL_DIR)/libefence.so.0
- 	ln -s libefence.so.0.0 $(LIB_INSTALL_DIR)/libefence.so.0
+ 	mkdir -p $(LIB_INSTALL_DIR)
+ 	$(INSTALL) -m 644 libefence.a $(LIB_INSTALL_DIR)/
+ 	$(INSTALL) -m 755 libefence.so.0.0 $(LIB_INSTALL_DIR)/
+@@ -41,7 +29,7 @@
  	- rm -f $(LIB_INSTALL_DIR)/libefence.so
- 	ln -s libefence.so.0.0 $(LIB_INSTALL_DIR)/libefence.so
--	$(INSTALL) -m 644 efence.3 $(MAN_INSTALL_DIR)/libefence.3
+ 	ln -s libefence.so.0 $(LIB_INSTALL_DIR)/libefence.so
+ 	mkdir -p $(MAN_INSTALL_DIR)
+-	$(INSTALL) -m 644 libefence.3 $(MAN_INSTALL_DIR)/libefence.3
 +	$(INSTALL) -Dm 644 libefence.3 $(MAN_INSTALL_DIR)/libefence.3
  
  clean:
  	- rm -f $(OBJECTS) tstheap.o eftest.o tstheap eftest \
-@@ -61,7 +46,7 @@ libefence.a: $(OBJECTS)
+@@ -63,7 +51,7 @@
  
  libefence.so.0.0: $(OBJECTS)
  	$(CC) -shared -Wl,-soname,libefence.so.0 -o libefence.so.0.0 \
diff --git a/packages/electric-fence/build.sh b/packages/electric-fence/build.sh
index b1e0b8714..0b77ba7fe 100644
--- a/packages/electric-fence/build.sh
+++ b/packages/electric-fence/build.sh
@@ -2,8 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://elinux.org/Electric_Fence
 TERMUX_PKG_DESCRIPTION="Electric Fence (eFence) malloc memory debugger"
 TERMUX_PKG_LICENSE=GPL-2.0
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.2.5
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=2.2.6
 TERMUX_PKG_SRCURL=https://deb.debian.org/debian/pool/main/e/electric-fence/electric-fence_${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=8aa8d1e5772a169098f0aba6e647295c12561a6851ef9b378a54020e8086bcc6
+TERMUX_PKG_SHA256=a949e0dedb06cbcd444566cce1457223f2c41abd3513f21663f30f19ccc48e24
 TERMUX_PKG_BUILD_IN_SRC=true