commit: e5db9a1eff9ea918423e85fd5b559ffcacf694ca
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 09:55:40 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 09:56:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5db9a1e
www-servers/monkeyd: bump to 1.6.8, remove older unstable
Package-Manager: portage-2.2.26
www-servers/monkeyd/Manifest | 2 +-
.../monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch | 19 +++++++++++++++++++
.../{monkeyd-1.6.6.ebuild => monkeyd-1.6.8.ebuild} | 4 ++--
www-servers/monkeyd/monkeyd-9999.ebuild | 4 ++--
4 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 73804ec..a693d8d 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,3 +1,3 @@
DIST monkey-1.5.6.tar.gz 902636 SHA256
7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512
4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c
WHIRLPOOL
aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
-DIST monkey-1.6.6.tar.gz 2035885 SHA256
4ad8258d6cb6fb8b9d98891a7c84a559ab7ab96f7dde0ecdfc23a1a8d594ce11 SHA512
c56edcd2bb18fbe4e4f364853e4796be1211cca7829899cde94500d514ded7ba8cca44c6e5f964b8864d0348caf1a570ac558c287f708c081a40aeecef8ee2cf
WHIRLPOOL
60b95e0c81b9ce3faf2a87acf9496a8510d5d6d66501850c2d45cab39505b58f9f22ec9936002ff06cd4b13d6ac787b144409f64625fc56042fdfef4bfee79a4
DIST monkey-1.6.7.tar.gz 2038458 SHA256
32bf4126d1947c426eb2aa269f4bfa08fe5e42b4966468f2fea8e9a3cdfc8ea1 SHA512
7da091f7252c7188e7a30c56c704984d3806b001bb74c15b6f742fc527304cb8821b6da5da2a7275f15f5cd29c3d412ad0534075867893b4aea7a6f8a309df90
WHIRLPOOL
fdc451925b241f1ef3b8b4e6e6dd6c2869b3408d1ad41498107f12cd04e845a730501f5c8c070c30643ae9fa4384395034e7ccd2b3da30e61730def4e9a1b91a
+DIST monkey-1.6.8.tar.gz 1967478 SHA256
936aa276d11dea77cda2703eb5d1b89ede1cf8d44440e1ec029cafb10effb3cf SHA512
44d3c9785190849e50ffc28168a41939ddb9fa62e7c0ead26fa67ff78eae1b3855a9729b3de520b53d629607b456e9fa6fe31b7d0b0036c514c1d13296b7e8db
WHIRLPOOL
227559f6e625ca78690072aff0eddfcbdad2aba11b395c2636b58ce3329b657324975631be0392e4e92004fb0233bda3384fb080b2381035bf7d743d198ef4bc
diff --git a/www-servers/monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch
b/www-servers/monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch
new file mode 100644
index 0000000..6b7ca54
--- /dev/null
+++ b/www-servers/monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch
@@ -0,0 +1,19 @@
+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.2.1)
+- add_subdirectory(${MK_MBEDTLS_SRC} ${CMAKE_BINARY_DIR}/mbedtls-2.2.1)
+- include_directories(${MK_MBEDTLS_SRC}/include)
+-endif()
+-
+ MONKEY_PLUGIN(tls "${src}")
+
+ MONKEY_PLUGIN_LINK_LIB(tls mbedtls)
diff --git a/www-servers/monkeyd/monkeyd-1.6.6.ebuild
b/www-servers/monkeyd/monkeyd-1.6.8.ebuild
similarity index 97%
rename from www-servers/monkeyd/monkeyd-1.6.6.ebuild
rename to www-servers/monkeyd/monkeyd-1.6.8.ebuild
index add07dc..3221de5 100644
--- a/www-servers/monkeyd/monkeyd-1.6.6.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -59,7 +59,7 @@ pkg_setup() {
src_prepare() {
# Unconditionally get rid of the bundled jemalloc
rm -rf "${S}"/deps
- epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch
+ epatch "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
}
src_configure() {
diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild
b/www-servers/monkeyd/monkeyd-9999.ebuild
index add07dc..3221de5 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -59,7 +59,7 @@ pkg_setup() {
src_prepare() {
# Unconditionally get rid of the bundled jemalloc
rm -rf "${S}"/deps
- epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch
+ epatch "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
}
src_configure() {
