commit: 4ccb17a7ea9993b9833599dbca985202e1967832
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail
<DOT> com>
AuthorDate: Thu Feb 16 16:32:09 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 06:19:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ccb17a7
www-servers/monkeyd: remove unused patches
.../monkeyd/files/monkeyd-1.5.0-fix-CPPFLAGS.patch | 17 ---
.../files/monkeyd-1.5.2-use-system-jemalloc.patch | 157 ---------------------
.../files/monkeyd-1.6.3-system-mbedtls.patch | 19 ---
3 files changed, 193 deletions(-)
diff --git a/www-servers/monkeyd/files/monkeyd-1.5.0-fix-CPPFLAGS.patch
b/www-servers/monkeyd/files/monkeyd-1.5.0-fix-CPPFLAGS.patch
deleted file mode 100644
index 9e88bc999d..0000000000
--- a/www-servers/monkeyd/files/monkeyd-1.5.0-fix-CPPFLAGS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur monkey-1.5.0.orig/plugins/auth/tools/Makefile.in
monkey-1.5.0/plugins/auth/tools/Makefile.in
---- monkey-1.5.0.orig/plugins/auth/tools/Makefile.in 2014-05-25
19:12:44.000000000 -0400
-+++ monkey-1.5.0/plugins/auth/tools/Makefile.in 2014-05-26
13:15:29.347727637 -0400
-@@ -3,10 +3,11 @@
-
- CC = @echo " CC $(_PATH)/$@"; $CC
- CC_QUIET= @echo -n; $CC
--CFLAGS = -I../../../src/include -I../ $CFLAGS
-+CPPFLAGS = -I../../../src/include -I../
-+CFLAGS = $CFLAGS
- LDFLAGS = $LDFLAGS
- SOURCES = ../sha1.c ../base64.c mk_passwd.c
- OBJECTS = $(SOURCES:../.c=%.o)
-
- ../../../bin/mk_passwd: $(OBJECTS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -ldl
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -ldl
diff --git a/www-servers/monkeyd/files/monkeyd-1.5.2-use-system-jemalloc.patch
b/www-servers/monkeyd/files/monkeyd-1.5.2-use-system-jemalloc.patch
deleted file mode 100644
index a4934a4e21..0000000000
--- a/www-servers/monkeyd/files/monkeyd-1.5.2-use-system-jemalloc.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-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"
- create_makefile2 mod_libs mod_obj make_script platform \
-- malloc_libc malloc_jemalloc
-+ malloc_libc
-
- echo "+ Creating plugins/Make.common"
- create_plugins_make_common bindir
-@@ -210,33 +210,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"
-@@ -316,12 +295,6 @@
- # Create Makefile
- create_makefile1()
- {
-- if [ $malloc_jemalloc -eq 1 ]; then
-- $deps="deps/jemalloc"
-- else
-- $deps=""
-- fi
--
- cat > Makefile << EOF
- # Monkey HTTP Daemon: Makefile
- # ============================
-@@ -459,13 +432,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
-@@ -523,10 +489,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)
-@@ -605,9 +567,7 @@
- fi
-
- if [ $malloc_jemalloc -eq 1 ]; then
-- extra="../deps/jemalloc/lib/libjemalloc.a"
-- extraso="-Wl,--whole-archive
../deps/jemalloc/lib/libjemalloc_pic.a -Wl,--no-whole-archive"
-- libs="$libs -lm"
-+ libs="$libs -ljemalloc"
- fi
-
- cat > src/Makefile<<EOF
-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>
- #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/files/monkeyd-1.6.3-system-mbedtls.patch
b/www-servers/monkeyd/files/monkeyd-1.6.3-system-mbedtls.patch
deleted file mode 100644
index 30d13cc426..0000000000
--- a/www-servers/monkeyd/files/monkeyd-1.6.3-system-mbedtls.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur monkey-1.6.3.orig/plugins/tls/CMakeLists.txt
monkey-1.6.3/plugins/tls/CMakeLists.txt
---- monkey-1.6.3.orig/plugins/tls/CMakeLists.txt 2015-10-13
13:23:34.000000000 -0400
-+++ monkey-1.6.3/plugins/tls/CMakeLists.txt 2015-10-14 21:28:27.941930485
-0400
-@@ -2,15 +2,6 @@
- tls.c
- )
-
--if(NOT WITH_MBEDTLS_SHARED)
-- option(ENABLE_TESTING OFF)
-- option(ENABLE_PROGRAMS OFF)
-- option(INSTALL_MBEDTLS_HEADERS OFF)
-- set(MK_MBEDTLS_SRC ../../deps/mbedtls-2.1.2)
-- add_subdirectory(${MK_MBEDTLS_SRC} ${CMAKE_BINARY_DIR}/mbedtls-2.1.2)
-- include_directories(${MK_MBEDTLS_SRC}/include)
--endif()
--
- MONKEY_PLUGIN(tls "${src}")
-
- MONKEY_PLUGIN_LINK_LIB(tls mbedtls)
