updated fork of electric fence (fixes bug 160695)

Package-Manager: portage-2.1.2.2

3 files changed, 87 insertions, 0 deletions

diff --git a/dev-util/duma/files/digest-duma-2.4.27 b/dev-util/duma/files/digest-duma-2.4.27
new file mode 100644
index 000000000000..88c0254313fa
--- /dev/null
+++ b/dev-util/duma/files/digest-duma-2.4.27
@@ -0,0 +1,3 @@
+MD5 6fdcce41c593f164951d215542b6ef03 duma_2_4_27.tar.gz 89150
+RMD160 97031490edb832d325243ed09b0132393faa730d duma_2_4_27.tar.gz 89150
+SHA256 4993373c7f0241e8e247e510335157c22b113a9cb449fd7d346d6f494c6211d8 duma_2_4_27.tar.gz 89150
diff --git a/dev-util/duma/files/duma-2.4.27-make.patch b/dev-util/duma/files/duma-2.4.27-make.patch
new file mode 100644
index 000000000000..4fffab8f4303
--- /dev/null
+++ b/dev-util/duma/files/duma-2.4.27-make.patch
@@ -0,0 +1,51 @@
+diff -urN Makefile Makefile
+--- Makefile	2007-01-07 14:38:21.000000000 +0100
++++ Makefile	2007-01-07 14:38:39.000000000 +0100
+@@ -109,7 +109,7 @@
+ prefix=/usr
+ BIN_INSTALL_DIR= $(prefix)/bin
+ LIB_INSTALL_DIR= $(prefix)/lib
+-MAN_INSTALL_DIR= $(prefix)/man/man3
++MAN_INSTALL_DIR= $(prefix)/share/man/man3
+ 
+ 
+ 
+@@ -123,7 +123,9 @@
+ 
+ SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
+ 
+-all:	libduma.a $(DUMASO) tstheap dumatest dumatestpp testoperators tstheap_so dumatestpp_so
++all:	libduma.a $(DUMASO) 
++
++check:	tstheap dumatest dumatestpp testoperators tstheap_so dumatestpp_so
+ 	@ echo "Testing DUMA."
+ 	@ echo "After the last test, it should print that the test has PASSED."
+ 	$(CURPATH)dumatest
+@@ -134,13 +136,16 @@
+ 	@ echo "DUMA confidence test PASSED."
+ 
+ install: libduma.a duma.3 $(DUMASO)
++	${INSTALL} -d ${BIN_INSTALL_DIR}
+ 	$(INSTALL) -m 755 duma.sh $(BIN_INSTALL_DIR)/duma
++	${INSTALL} -d ${LIB_INSTALL_DIR}
+ 	$(INSTALL) -m 644 libduma.a $(LIB_INSTALL_DIR)
+ 	$(INSTALL) -m 755 $(DUMASO) $(LIB_INSTALL_DIR)
+ 	- rm -f $(LIB_INSTALL_DIR)/$(DUMASO_LINK1)
+ 	ln -s $(DUMASO) $(LIB_INSTALL_DIR)/$(DUMASO_LINK1)
+ 	- rm -f $(LIB_INSTALL_DIR)/$(DUMASO_LINK2)
+ 	ln -s $(DUMASO) $(LIB_INSTALL_DIR)/$(DUMASO_LINK2)
++	${INSTALL} -d ${MAN_INSTALL_DIR}
+ 	$(INSTALL) -m 644 duma.3 $(MAN_INSTALL_DIR)/duma.3
+ 
+ clean:
+@@ -201,8 +206,8 @@
+ ifneq ($(OS), Windows_NT)
+ 
+ $(DUMASO): duma_config.h $(SO_OBJECTS)
+-	$(CXX) -g -shared -Wl,-soname,$(DUMASO) -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc
+-	$(CXX) -g -shared -o $(DUMASO) $(SO_OBJECTS) -lpthread -lc
++	$(CXX) -g -shared -Wl,-soname,$(DUMASO) -o $(DUMASO) $(SO_OBJECTS) -lpthread
++#	$(CXX) -g -shared -o $(DUMASO) $(SO_OBJECTS) -lpthread
+ 
+ endif
+ 
diff --git a/dev-util/duma/files/duma-2.4.27-types.patch b/dev-util/duma/files/duma-2.4.27-types.patch
new file mode 100644
index 000000000000..902b5407589b
--- /dev/null
+++ b/dev-util/duma/files/duma-2.4.27-types.patch
@@ -0,0 +1,33 @@
+--- duma.c.orig	2007-03-18 20:41:35.000000000 -0700
++++ duma.c	2007-03-18 20:43:08.000000000 -0700
+@@ -230,7 +230,7 @@
+  * so that its name matches the name of the environment variable that is used
+  * to set it. This gives the programmer one less name to remember.
+  */
+-int           DUMA_ALIGNMENT = DUMA_MIN_ALIGNMENT;
++size_t           DUMA_ALIGNMENT = DUMA_MIN_ALIGNMENT;
+ 
+ /*
+  * DUMA_PROTECT_BELOW is used to modify the behavior of the allocator. When
+--- duma.h.orig	2007-03-18 20:41:26.000000000 -0700
++++ duma.h	2007-03-18 20:44:29.000000000 -0700
+@@ -64,7 +64,7 @@
+ #define DUMA_EXTERNS_DECLARED

+ /* global DUMA variables */
+ DUMA_EXTERN_C int  DUMA_PROTECT_BELOW;
+-DUMA_EXTERN_C int  DUMA_ALIGNMENT;
++DUMA_EXTERN_C size_t  DUMA_ALIGNMENT;
+ DUMA_EXTERN_C int  DUMA_FILL;
+ DUMA_EXTERN_C struct _DUMA_Slot * _duma_allocList;
+ #ifndef DUMA_NO_CPP_SUPPORT

+--- dumatest.c.orig	2007-03-18 20:51:19.000000000 -0700
++++ dumatest.c	2007-03-18 20:51:33.000000000 -0700
+@@ -53,7 +53,7 @@
+ };
+ 
+ extern int  DUMA_PROTECT_BELOW;
+-extern int  DUMA_ALIGNMENT;
++extern size_t  DUMA_ALIGNMENT;
+ 
+ static jmp_buf  env;
+