Merge pull request #618

64f4cd9 My markdown-fu sucks :P (me0wmix)
a6794e2 Instructions updated to include g++ package and omit optional packages (me0wmix)
34ebfe3 Last fixups in the Cmake stuff and better default build instruction (me0wmix)
82ecb3f More formatting fixes to instructions (me0wmix)
efc771d Corrected formatting on OpenBSD instructions (me0wmix)
c965bf4 Added/corrected OpenBSD build instructions. (me0wmix)
28f95eb OpenBSD support for Monero. (me0wmix)

CMakeLists.txt

@@ -139,12 +139,15 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "DragonFly.*|FreeBSD")
   set(FREEBSD TRUE)
 endif()
 
-# TODO: check bsdi, NetBSD, OpenBSD, to see if they need the same FreeBSD changes
+# Check if we're on OpenBSD. See the README.md for build instructions.
+if(CMAKE_SYSTEM_NAME MATCHES "kOpenBSD.*|OpenBSD.*")
+  set(OPENBSD TRUE)
+endif()
+
+# TODO: check bsdi, NetBSD, to see if they need the same FreeBSD changes
 #
 # elseif(CMAKE_SYSTEM_NAME MATCHES "kNetBSD.*|NetBSD.*")
 #   set(NETBSD TRUE)
-# elseif(CMAKE_SYSTEM_NAME MATCHES "kOpenBSD.*|OpenBSD.*")
-#   set(OPENBSD TRUE)
 # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
 #   set(BSDI TRUE)
 
@@ -379,7 +382,7 @@ else()
       set(RELEASE_FLAGS "${RELEASE_FLAGS} -ffat-lto-objects")
     endif()
     # Since gcc 4.9 the LTO format is non-standard (slim), so we need the gcc-specific ar and ranlib binaries
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0))
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0) AND NOT OPENBSD)
       set(CMAKE_AR "gcc-ar")
       set(CMAKE_RANLIB "gcc-ranlib")
     endif()
@@ -389,7 +392,7 @@ else()
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEBUG_FLAGS}")
   set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${RELEASE_FLAGS}")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${RELEASE_FLAGS}")
-  if(STATIC AND NOT APPLE AND NOT FREEBSD)
+  if(STATIC AND NOT APPLE AND NOT FREEBSD AND NOT OPENBSD)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
   endif()
 endif()
@@ -421,7 +424,7 @@ endif()
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 if(MINGW)
   set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi)
-elseif(APPLE OR FREEBSD)
+elseif(APPLE OR FREEBSD OR OPENBSD)
   set(EXTRA_LIBRARIES "")
 elseif(NOT MSVC)
   find_library(RT rt)

README.md

@@ -162,6 +162,21 @@ The project can be built from scratch by following instructions for Unix and Lin
 
 We expect to add Monero into the ports tree in the near future, which will aid in managing installations using ports or packages.
 
+### On OpenBSD:
+
+This has been tested on OpenBSD 5.8.
+
+You will need to add a few packages to your system. `pkg_add db cmake gcc gcc-libs g++ miniupnpc gtest`.
+
+The doxygen and graphviz packages are optional and require the xbase set.
+
+The Boost package has a bug that will prevent librpc.a from building correctly. In order to fix this, you will have to Build boost yourself from scratch. Follow the directions here (under "Building Boost"):
+https://github.com/bitcoin/bitcoin/blob/master/doc/build-openbsd.md
+
+You will have to add the serialization, date_time, and regex modules to Boost when building as they are needed by Monero.
+
+To build: `env CC=egcc CXX=eg++ CPP=ecpp DEVELOPER_LOCAL_TOOLS=1 BOOST_ROOT=/path/to/the/boost/you/built make release-static-64`
+
 ## Building Documentation
 
 Monero developer documentation uses Doxygen, and is currently a work-in-progress.

contrib/epee/include/console_handler.h

@@ -33,6 +33,9 @@
 #include <mutex>
 #include <thread>
 #include <iostream>
+#ifdef __OpenBSD__
+#include <stdio.h>
+#endif
 
 namespace epee
 {
@@ -129,7 +132,11 @@ namespace epee
     bool wait_stdin_data()
     {
 #if !defined(WIN32)
+      #ifdef __OpenBSD__
+      int stdin_fileno = fileno(stdin);
+      #else
       int stdin_fileno = ::fileno(stdin);
+      #endif
 
       while (m_run.load(std::memory_order_relaxed))
       {

src/blockchain_db/berkeleydb/db_bdb.cpp

@@ -783,9 +783,11 @@ void BlockchainBDB::open(const std::string& filename, const int db_flags)
         m_env->set_lk_max_locks(DB_MAX_LOCKS);
         m_env->set_lk_max_lockers(DB_MAX_LOCKS);
         m_env->set_lk_max_objects(DB_MAX_LOCKS);
-        
+
+        #ifndef __OpenBSD__ //OpenBSD's DB package is too old to support this feature
         if(m_auto_remove_logs)
           m_env->log_set_config(DB_LOG_AUTO_REMOVE, 1);
+        #endif
 
         // last parameter left 0, files will be created with default rw access
         m_env->open(filename.c_str(), db_env_open_flags, 0);

src/common/int-util.h

@@ -137,6 +137,7 @@ static inline uint32_t div128_32(uint64_t dividend_hi, uint64_t dividend_lo, uin
 static inline uint32_t ident32(uint32_t x) { return x; }
 static inline uint64_t ident64(uint64_t x) { return x; }
 
+#ifndef __OpenBSD__
 static inline uint32_t swap32(uint32_t x) {
   x = ((x & 0x00ff00ff) << 8) | ((x & 0xff00ff00) >> 8);
   return (x << 16) | (x >> 16);
@@ -146,6 +147,7 @@ static inline uint64_t swap64(uint64_t x) {
   x = ((x & 0x0000ffff0000ffff) << 16) | ((x & 0xffff0000ffff0000) >> 16);
   return (x << 32) | (x >> 32);
 }
+#endif
 
 #if defined(__GNUC__)
 #define UNUSED __attribute__((unused))

src/crypto/crypto.cpp

@@ -41,7 +41,7 @@
 #include "crypto.h"
 #include "hash.h"
 
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
  #include <alloca.h>
 #else
  #include <stdlib.h>

src/crypto/oaes_lib.c

@@ -37,13 +37,13 @@ static const char _NR[] = {
 #include <stdlib.h>
 #include <stdio.h>
 
-// Both OS X and FreeBSD don't need malloc.h
+// OS X, FreeBSD, and OpenBSD don't need malloc.h
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
  #include <malloc.h>
 #endif
 
-// FreeBSD also doesn't need timeb.h
+// FreeBSD, and OpenBSD also don't need timeb.h
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
  #include <sys/timeb.h>
 #else
  #include <sys/time.h>
@@ -470,7 +470,7 @@ OAES_RET oaes_sprintf(
 #ifdef OAES_HAVE_ISAAC
 static void oaes_get_seed( char buf[RANDSIZ + 1] )
 {
-	#ifndef __FreeBSD__
+        #if !defined(__FreeBSD__) && !defined(__OpenBSD__)
 	struct timeb timer;
 	struct tm *gmTimer;
 	char * _test = NULL;
@@ -502,7 +502,7 @@ static void oaes_get_seed( char buf[RANDSIZ + 1] )
 #else
 static uint32_t oaes_get_seed(void)
 {
-	#ifndef __FreeBSD__
+        #if !defined(__FreeBSD__) && !defined(__OpenBSD__)
 	struct timeb timer;
 	struct tm *gmTimer;
 	char * _test = NULL;

src/crypto/slow-hash.c

@@ -421,7 +421,7 @@ void slow_hash_allocate_state(void)
     hp_state = (uint8_t *) VirtualAlloc(hp_state, MEMORY, MEM_LARGE_PAGES |
                                         MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 #else
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
     hp_state = mmap(0, MEMORY, PROT_READ | PROT_WRITE,
                     MAP_PRIVATE | MAP_ANON, 0, 0);
 #else

src/crypto/tree-hash.c

@@ -34,7 +34,7 @@
 
 #include "hash-ops.h"
 
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
  #include <alloca.h>
 #else
  #include <stdlib.h>

tests/performance_tests/performance_utils.h

@@ -40,7 +40,7 @@
 
 void set_process_affinity(int core)
 {
-#if defined (__APPLE__) || defined(__FreeBSD__)
+#if defined (__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
     return;
 #elif defined(BOOST_WINDOWS)
   DWORD_PTR mask = 1;
@@ -62,7 +62,7 @@ void set_process_affinity(int core)
 
 void set_thread_high_priority()
 {
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
     return;
 #elif defined(BOOST_WINDOWS)
   ::SetPriorityClass(::GetCurrentProcess(), HIGH_PRIORITY_CLASS);

tests/unit_tests/slow_memmem.cpp

@@ -35,8 +35,8 @@
 #include <stdint.h>
 #include "gtest/gtest.h"
 
-// Both OS X and FreeBSD don't need malloc.h
+// OS X, FreeBSD, and OpenBSD don't need malloc.h
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
  #include <malloc.h>
 #endif