net-p2p/monero-cli: Upgrade from 0.11.1.0 to 0.12.0.0

7 files changed, 40 insertions, 220 deletions

diff --git a/net-p2p/monero-cli/Makefile b/net-p2p/monero-cli/Makefile
index fe7e415acd60..28190ce7d9d5 100644
--- a/net-p2p/monero-cli/Makefile
+++ b/net-p2p/monero-cli/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	monero-cli
-PORTVERSION=	0.11.1.0
+PORTVERSION=	0.12.0.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	vd@FreeBSD.org
@@ -22,6 +21,9 @@ LIB_DEPENDS=	\
 		libboost_system.so:devel/boost-libs \
 		libboost_thread.so:devel/boost-libs \
 		libminiupnpc.so:net/miniupnpc \
+		libnorm.so:net/norm \
+		libpgm.so:net/openpgm \
+		libunbound.so:dns/unbound \
 		libunwind.so:devel/libunwind \
 		libzmq.so:net/libzmq4
 BUILD_DEPENDS=	${LOCALBASE}/include/zmq.hpp:net/cppzmq
@@ -42,8 +44,14 @@ USE_RC_SUBR=	monerod
 USERS=		monero
 GROUPS=		monero
 
-PLIST_FILES=	bin/monerod \
+PLIST_FILES=	\
+		bin/monero-blockchain-blackball \
+		bin/monero-blockchain-export \
+		bin/monero-blockchain-import \
+		bin/monero-blockchain-usage \
+		bin/monero-gen-trusted-multisig \
 		bin/monero-wallet-cli \
-		bin/monero-wallet-rpc
+		bin/monero-wallet-rpc \
+		bin/monerod
 
 .include <bsd.port.mk>
diff --git a/net-p2p/monero-cli/distinfo b/net-p2p/monero-cli/distinfo
index 48ef2af78de0..dbe06a56c65d 100644
--- a/net-p2p/monero-cli/distinfo
+++ b/net-p2p/monero-cli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508829354
-SHA256 (monero-project-monero-v0.11.1.0_GH0.tar.gz) = b5b48d3e5317c599e1499278580e9a6ba3afc3536f4064fcf7b20840066a509b
-SIZE (monero-project-monero-v0.11.1.0_GH0.tar.gz) = 55329159
+TIMESTAMP = 1521964559
+SHA256 (monero-project-monero-v0.12.0.0_GH0.tar.gz) = 5e8303900a39e296c4ebaa41d957ab9ee04e915704e1049f82a9cbd4eedc8ffb
+SIZE (monero-project-monero-v0.12.0.0_GH0.tar.gz) = 8608168
diff --git a/net-p2p/monero-cli/files/patch-CMakeLists.txt b/net-p2p/monero-cli/files/patch-CMakeLists.txt
deleted file mode 100644
index 3fed06fbaacc..000000000000
--- a/net-p2p/monero-cli/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-https://github.com/monero-project/monero/pull/2793
-
---- CMakeLists.txt.orig	2017-11-11 15:31:39 UTC
-+++ CMakeLists.txt
-@@ -682,7 +682,7 @@ endif()
- if(ANDROID)
-   set(ATOMIC libatomic.a)
- endif()
--if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND ARCH_WIDTH EQUAL "32" AND NOT IOS)
-+if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND ARCH_WIDTH EQUAL "32" AND NOT IOS AND NOT FREEBSD)
-   find_library(ATOMIC atomic)
-   list(APPEND EXTRA_LIBRARIES ${ATOMIC})
- endif()
diff --git a/net-p2p/monero-cli/files/patch-cmake_Version.cmake b/net-p2p/monero-cli/files/patch-cmake_Version.cmake
new file mode 100644
index 000000000000..41340fea7aea
--- /dev/null
+++ b/net-p2p/monero-cli/files/patch-cmake_Version.cmake
@@ -0,0 +1,16 @@
+--- cmake/Version.cmake.orig	2018-03-26 15:12:24 UTC
++++ cmake/Version.cmake
+@@ -28,11 +28,11 @@
+ 
+ function (write_static_version_header hash)
+   set(VERSIONTAG "${hash}")
+-  configure_file("src/version.cpp.in" "version.cpp")
++  configure_file("${CMAKE_BINARY_DIR}/src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp")
+ endfunction ()
+ 
+ find_package(Git QUIET)
+-if ("$Format:$" STREQUAL "")
++if (TRUE)
+   # We're in a tarball; use hard-coded variables.
+   write_static_version_header("release")
+ elseif (GIT_FOUND OR Git_FOUND)
diff --git a/net-p2p/monero-cli/files/patch-src_cryptonote_basic_miner.cpp b/net-p2p/monero-cli/files/patch-src_cryptonote_basic_miner.cpp
deleted file mode 100644
index 925954f679d3..000000000000
--- a/net-p2p/monero-cli/files/patch-src_cryptonote_basic_miner.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-
-https://github.com/monero-project/monero/pull/2792
-
---- src/cryptonote_basic/miner.cpp.orig
-+++ src/cryptonote_basic/miner.cpp
-@@ -50,12 +50,25 @@
-   #include <IOKit/ps/IOPowerSources.h>
-   #include <mach/mach_host.h>
-   #include <AvailabilityMacros.h>
-   #include <TargetConditionals.h>
- #endif
- 
-+#ifdef __FreeBSD__
-+#include <devstat.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <machine/apm_bios.h>
-+#include <stdio.h>
-+#include <sys/resource.h>
-+#include <sys/sysctl.h>
-+#include <sys/times.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+#endif
-+
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "miner"
- 
- using namespace epee;
- 
- #include "miner.h"
-@@ -732,14 +745,12 @@ namespace cryptonote
- 
-         return true;
-     	}
- 
-     #elif defined(__linux__)
- 
--      const std::string STR_CPU("cpu");
--      const std::size_t STR_CPU_LEN = STR_CPU.size();
-       const std::string STAT_FILE_PATH = "/proc/stat";
- 
-       if( !epee::file_io_utils::is_file_exist(STAT_FILE_PATH) )
-       {
-         LOG_ERROR("'" << STAT_FILE_PATH << "' file does not exist");
-         return false;
-@@ -782,15 +793,42 @@ namespace cryptonote
- 
-       idle_time = stats.cpu_ticks[CPU_STATE_IDLE];
-       total_time = idle_time + stats.cpu_ticks[CPU_STATE_USER] + stats.cpu_ticks[CPU_STATE_SYSTEM];
-       
-       return true;
- 
-+    #elif defined(__FreeBSD__)
-+
-+      struct statinfo s;
-+      size_t n = sizeof(s.cp_time);
-+      if( sysctlbyname("kern.cp_time", s.cp_time, &n, NULL, 0) == -1 )
-+      {
-+        LOG_ERROR("sysctlbyname(\"kern.cp_time\"): " << strerror(errno));
-+        return false;
-+      }
-+      if( n != sizeof(s.cp_time) )
-+      {
-+        LOG_ERROR("sysctlbyname(\"kern.cp_time\") output is unexpectedly "
-+          << n << " bytes instead of the expected " << sizeof(s.cp_time)
-+          << " bytes.");
-+        return false;
-+      }
-+
-+      idle_time = s.cp_time[CP_IDLE];
-+      total_time =
-+        s.cp_time[CP_USER] +
-+        s.cp_time[CP_NICE] +
-+        s.cp_time[CP_SYS] +
-+        s.cp_time[CP_INTR] +
-+        s.cp_time[CP_IDLE];
-+
-+      return true;
-+
-     #endif
- 
--    return false; // unsupported systemm..
-+    return false; // unsupported system
-   }
-   //-----------------------------------------------------------------------------------------------------
-   bool miner::get_process_time(uint64_t& total_time)
-   {
-     #ifdef _WIN32
- 
-@@ -804,24 +842,24 @@ namespace cryptonote
-           ( (((uint64_t)(kernelTime.dwHighDateTime)) << 32) | ((uint64_t)kernelTime.dwLowDateTime) )
-           + ( (((uint64_t)(userTime.dwHighDateTime)) << 32) | ((uint64_t)userTime.dwLowDateTime) );
- 
-         return true;
-       }
- 
--    #elif (defined(__linux__) && defined(_SC_CLK_TCK)) || defined(__APPLE__)
-+    #elif (defined(__linux__) && defined(_SC_CLK_TCK)) || defined(__APPLE__) || defined(__FreeBSD__)
- 
-       struct tms tms;
-       if ( times(&tms) != (clock_t)-1 )
-       {
-     		total_time = tms.tms_utime + tms.tms_stime;
-         return true;
-       }
- 
-     #endif
- 
--    return false; // unsupported system..
-+    return false; // unsupported system
-   }
-   //-----------------------------------------------------------------------------------------------------  
-   uint8_t miner::get_percent_of_total(uint64_t other, uint64_t total)
-   {
-     return (uint8_t)( ceil( (other * 1.f / total * 1.f) * 100) );    
-   }
-@@ -926,12 +964,76 @@ namespace cryptonote
-       if (boost::logic::indeterminate(on_battery))
-       {
-         LOG_ERROR("couldn't query power status from " << power_supply_class_path);
-       }
-       return on_battery;
- 
-+    #elif defined(__FreeBSD__)
-+      int ac;
-+      size_t n = sizeof(ac);
-+      if( sysctlbyname("hw.acpi.acline", &ac, &n, NULL, 0) == -1 )
-+      {
-+        if( errno != ENOENT )
-+        {
-+          LOG_ERROR("Cannot query battery status: "
-+            << "sysctlbyname(\"hw.acpi.acline\"): " << strerror(errno));
-+          return boost::logic::tribool(boost::logic::indeterminate);
-+        }
-+
-+        // If sysctl fails with ENOENT, then try querying /dev/apm.
-+
-+        static const char* dev_apm = "/dev/apm";
-+        const int fd = open(dev_apm, O_RDONLY);
-+        if( fd == -1 ) {
-+          LOG_ERROR("Cannot query battery status: "
-+            << "open(): " << dev_apm << ": " << strerror(errno));
-+          return boost::logic::tribool(boost::logic::indeterminate);
-+        }
-+
-+        apm_info info;
-+        if( ioctl(fd, APMIO_GETINFO, &info) == -1 ) {
-+          close(fd);
-+          LOG_ERROR("Cannot query battery status: "
-+            << "ioctl(" << dev_apm << ", APMIO_GETINFO): " << strerror(errno));
-+          return boost::logic::tribool(boost::logic::indeterminate);
-+        }
-+
-+        close(fd);
-+
-+        // See apm(8).
-+        switch( info.ai_acline )
-+        {
-+        case 0: // off-line
-+        case 2: // backup power
-+          return boost::logic::tribool(true);
-+        case 1: // on-line
-+          return boost::logic::tribool(false);
-+        }
-+        switch( info.ai_batt_stat )
-+        {
-+        case 0: // high
-+        case 1: // low
-+        case 2: // critical
-+          return boost::logic::tribool(true);
-+        case 3: // charging
-+          return boost::logic::tribool(false);
-+        }
-+
-+        LOG_ERROR("Cannot query battery status: "
-+          << "sysctl hw.acpi.acline is not available and /dev/apm returns "
-+          << "unexpected ac-line status (" << info.ai_acline << ") and "
-+          << "battery status (" << info.ai_batt_stat << ").");
-+        return boost::logic::tribool(boost::logic::indeterminate);
-+      }
-+      if( n != sizeof(ac) )
-+      {
-+        LOG_ERROR("sysctlbyname(\"hw.acpi.acline\") output is unexpectedly "
-+          << n << " bytes instead of the expected " << sizeof(ac) << " bytes.");
-+        return boost::logic::tribool(boost::logic::indeterminate);
-+      }
-+      return boost::logic::tribool(ac == 0);
-     #endif
-     
-     LOG_ERROR("couldn't query power status");
-     return boost::logic::tribool(boost::logic::indeterminate);
-   }
- }
diff --git a/net-p2p/monero-cli/files/patch-src_wallet_api_CMakeLists.txt b/net-p2p/monero-cli/files/patch-src_wallet_api_CMakeLists.txt
new file mode 100644
index 000000000000..814be825002d
--- /dev/null
+++ b/net-p2p/monero-cli/files/patch-src_wallet_api_CMakeLists.txt
@@ -0,0 +1,9 @@
+--- src/wallet/api/CMakeLists.txt.orig	2018-03-26 15:45:58 UTC
++++ src/wallet/api/CMakeLists.txt
+@@ -87,6 +87,3 @@ if(IOS)
+ else()
+     set(lib_folder lib)
+ endif()
+-
+-install(FILES ${wallet_api_headers}
+-    DESTINATION include/wallet/api)
diff --git a/net-p2p/monero-cli/pkg-message b/net-p2p/monero-cli/pkg-message
deleted file mode 100644
index 3e20c90fd689..000000000000
--- a/net-p2p/monero-cli/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-If you observe segfaults during program exit, this is likely due to a
-bug in the boost libraries. It does not affect Monero behavior and is
-triggered by your malloc.conf(3) config.
-See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224599 for more
-details.