Fix bug #518086

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

4 files changed, 64 insertions, 120 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 53dbfe5e13ea..9c93559494f5 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/monkeyd
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.73 2014/07/23 15:49:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.74 2014/07/26 14:12:51 blueness Exp $
+
+  26 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/monkeyd-1.5.2-use-system-jemalloc.patch,
+  -files/monkeyd-1.4.0-use-system-jemalloc.patch,
+  -files/monkeyd-1.5.0-use-system-jemalloc.patch, monkeyd-1.5.2.ebuild:
+  Fix bug #518086
 
   23 Jul 2014; Anthony G. Basile <blueness@gentoo.org> -monkeyd-1.3.0.ebuild,
   -monkeyd-1.4.0.ebuild, -monkeyd-1.5.1.ebuild:
diff --git a/www-servers/monkeyd/files/monkeyd-1.4.0-use-system-jemalloc.patch b/www-servers/monkeyd/files/monkeyd-1.4.0-use-system-jemalloc.patch
deleted file mode 100644
index 70d6ad95337d..000000000000
--- a/www-servers/monkeyd/files/monkeyd-1.4.0-use-system-jemalloc.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -Naur monkey-1.4.0.orig/configure monkey-1.4.0/configure
---- monkey-1.4.0.orig/configure	2014-02-04 09:04:22.000000000 -0500
-+++ monkey-1.4.0/configure	2014-02-06 11:07:21.094086218 -0500
-@@ -193,7 +193,7 @@
- 
- 	echo "+ Creating src/Makefile"
- 	create_makefile2 mod_libs mod_obj make_script platform \
--                         malloc_libc malloc_jemalloc
-+                         malloc_libc
- 
- 	echo "+ Creating src/include/mk_info.h"
- 	create_info sysconfdir \
-@@ -205,33 +205,12 @@
- 
- 	echo -e "+ Creating Makefile"
- 	if [ "$dir" = 0 ]; then
--		create_makefile1 bindir malloc_jemalloc
-+		create_makefile1 bindir
- 	else
- 		create_makefile1_install prefix bindir mandir sysconfdir \
--                datadir logdir malloc_jemalloc
-+                datadir logdir
- 	fi
- 
--        # if the memory allocator is jemalloc, lets start configuring the dependency
--        if [ $malloc_jemalloc -eq 1 ]; then
--                echo
--                echo -e "\033[1m=== Configuring Memory Allocator ===\033[0m"
--                cd deps/jemalloc
--                ./configure $JEMALLOC_OPTS \
--                            --with-jemalloc-prefix=je_ \
--                            --enable-cc-silence \
--                            CFLAGS="-std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops " \
--                            LDFLAGS="" > jemalloc.config 2>&1
--                if [ $? -eq 0 ]; then
--                      echo "+ Jemalloc configured"
--                else
--                      cat jemalloc.config
--                      echo
--                      echo "check more details with: $ cat deps/jemalloc/config.log"
--                      exit 1
--                fi
--                cd ../../
--        fi
--
- 	echo
- 	echo -e "\033[1m=== Monkey Configuration ===\033[0m"
- 	echo -e "Platform\t= $platform"
-@@ -308,12 +287,6 @@
- # Create Makefile
- create_makefile1()
- {
--        if [ $malloc_jemalloc -eq 1 ]; then
--                $deps="deps/jemalloc"
--        else
--                $deps=""
--        fi
--
- 	cat > Makefile << EOF
- # Monkey HTTP Daemon: Makefile
- # ============================
-@@ -451,13 +424,6 @@
- 
- create_makefile1_install()
- {
--        # memory allocator
--        if [ $malloc_jemalloc -eq 1 ]; then
--                all_deps="$all_deps jemalloc"
--        else
--                deps=""
--        fi
--
- 	# remove old data
- 	rm -rf plugins.conf plugins.list
-         touch plugins.conf
-@@ -508,10 +474,6 @@
- 	@\$(MAKE) -s -C plugins all
- 	@echo "  DONE"
- 
--jemalloc:
--	@echo "  CC    jemalloc [all]"
--	@\$(MAKE) -s -C deps/jemalloc
--
- clean:
- 	@(cd src; \$(MAKE) clean)
- 	@(cd plugins; \$(MAKE) clean)
-@@ -589,8 +551,7 @@
- 	fi
- 
-         if [ $malloc_jemalloc -eq 1 ]; then
--                extra="../deps/jemalloc/lib/libjemalloc.a"
--                libs="$libs -lm"
-+                libs="$libs -ljemalloc"
-         fi
- 
- 	cat > src/Makefile<<EOF
-diff -Naur monkey-1.4.0.orig/src/include/mk_memory.h monkey-1.4.0/src/include/mk_memory.h
---- monkey-1.4.0.orig/src/include/mk_memory.h	2014-02-04 09:04:22.000000000 -0500
-+++ monkey-1.4.0/src/include/mk_memory.h	2014-02-06 11:06:52.298088521 -0500
-@@ -25,7 +25,8 @@
- #include <stdio.h>
- 
- #ifdef MALLOC_JEMALLOC
--#include "../../deps/jemalloc/include/jemalloc/jemalloc.h"
-+#include <jemalloc/jemalloc.h>
-+#include <jemalloc/jemalloc_defs.h>
- #endif
- 
- #include "mk_macros.h"
diff --git a/www-servers/monkeyd/files/monkeyd-1.5.0-use-system-jemalloc.patch b/www-servers/monkeyd/files/monkeyd-1.5.2-use-system-jemalloc.patch
index a11198061c0a..a4934a4e21c1 100644
--- a/www-servers/monkeyd/files/monkeyd-1.5.0-use-system-jemalloc.patch
+++ b/www-servers/monkeyd/files/monkeyd-1.5.2-use-system-jemalloc.patch
@@ -1,6 +1,6 @@
-diff -Naur monkey-1.5.0.orig/configure monkey-1.5.0/configure
---- monkey-1.5.0.orig/configure	2014-05-25 19:12:44.000000000 -0400
-+++ monkey-1.5.0/configure	2014-05-26 12:32:16.370879609 -0400
+diff -Naur monkey-1.5.2.orig/configure monkey-1.5.2/configure
+--- monkey-1.5.2.orig/configure	2014-07-19 23:27:13.000000000 -0400
++++ monkey-1.5.2/configure	2014-07-26 10:07:08.808171546 -0400
 @@ -193,7 +193,7 @@
  
  	echo "+ Creating src/Makefile"
@@ -95,16 +95,63 @@ diff -Naur monkey-1.5.0.orig/configure monkey-1.5.0/configure
          fi
  
  	cat > src/Makefile<<EOF
-diff -Naur monkey-1.5.0.orig/src/include/mk_memory.h monkey-1.5.0/src/include/mk_memory.h
---- monkey-1.5.0.orig/src/include/mk_memory.h	2014-05-25 19:12:44.000000000 -0400
-+++ monkey-1.5.0/src/include/mk_memory.h	2014-05-26 12:31:07.103883668 -0400
-@@ -23,7 +23,8 @@
+diff -Naur monkey-1.5.2.orig/src/include/mk_memory.h monkey-1.5.2/src/include/mk_memory.h
+--- monkey-1.5.2.orig/src/include/mk_memory.h	2014-07-19 23:27:13.000000000 -0400
++++ monkey-1.5.2/src/include/mk_memory.h	2014-07-26 10:08:06.427168785 -0400
+@@ -23,7 +23,7 @@
  #include <stdio.h>
  
  #ifdef MALLOC_JEMALLOC
 -#include "../../deps/jemalloc/include/jemalloc/jemalloc.h"
 +#include <jemalloc/jemalloc.h>
-+#include <jemalloc/jemalloc_defs.h>
  #endif
  
  #include "mk_macros.h"
+@@ -43,11 +43,7 @@
+ static inline ALLOCSZ_ATTR(1)
+ void *mk_mem_malloc(const size_t size)
+ {
+-#ifdef MALLOC_JEMALLOC
+-    void *aux = je_malloc(size);
+-#else
+     void *aux = malloc(size);
+-#endif
+ 
+     if (mk_unlikely(!aux && size)) {
+         perror("malloc");
+@@ -60,11 +56,7 @@
+ static inline ALLOCSZ_ATTR(1)
+ void *mk_mem_malloc_z(const size_t size)
+ {
+-#ifdef MALLOC_JEMALLOC
+-    void *buf = je_calloc(1, size);
+-#else
+     void *buf = calloc(1, size);
+-#endif
+ 
+     if (mk_unlikely(!buf)) {
+         return NULL;
+@@ -76,11 +68,7 @@
+ static inline ALLOCSZ_ATTR(2)
+ void *mk_mem_realloc(void *ptr, const size_t size)
+ {
+-#ifdef MALLOC_JEMALLOC
+-    void *aux = je_realloc(ptr, size);
+-#else
+     void *aux = realloc(ptr, size);
+-#endif
+ 
+     if (mk_unlikely(!aux && size)) {
+         perror("realloc");
+@@ -92,11 +80,7 @@
+ 
+ static inline void mk_mem_free(void *ptr)
+ {
+-#ifdef MALLOC_JEMALLOC
+-    je_free(ptr);
+-#else
+     free(ptr);
+-#endif
+ }
+ 
+ void mk_mem_free(void *ptr);
diff --git a/www-servers/monkeyd/monkeyd-1.5.2.ebuild b/www-servers/monkeyd/monkeyd-1.5.2.ebuild
index 967c3146f392..ea842ef1aa22 100644
--- a/www-servers/monkeyd/monkeyd-1.5.2.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.2.ebuild,v 1.2 2014/07/23 15:48:19 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.2.ebuild,v 1.3 2014/07/26 14:12:51 blueness Exp $
 
 EAPI="5"
 
@@ -45,7 +45,7 @@ pkg_setup() {
 src_prepare() {
 	# Unconditionally get rid of the bundled jemalloc
 	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.5.0-use-system-jemalloc.patch
+	epatch "${FILESDIR}"/${PN}-1.5.2-use-system-jemalloc.patch
 	epatch "${FILESDIR}"/${PN}-1.5.0-fix-CPPFLAGS.patch
 
 	# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd instead