Import libbase58 for base58 encoding/decoding

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "ccan"]
 	path = ccan-upstream
 	url = git://git.ozlabs.org/~ccan/ccan
+[submodule "libbase58"]
+	path = libbase58
+	url = https://github.com/luke-jr/libbase58.git

Makefile.am

@@ -82,10 +82,10 @@ version.h: update-version
 bfgminer_SOURCES += version.h
 BUILT_SOURCES = version.h
 
-SUBDIRS += $(libblkmaker_SUBDIRS)
-bfgminer_LDADD += $(libblkmaker_LIBS)
-bfgminer_CPPFLAGS += $(libblkmaker_CFLAGS)
-EXTRA_bfgminer_DEPENDENCIES += $(libblkmaker_EXTRADEPS)
+SUBDIRS += $(libbase58_SUBDIRS) $(libblkmaker_SUBDIRS)
+bfgminer_LDADD += $(libbase58_LIBS) $(libblkmaker_LIBS)
+bfgminer_CPPFLAGS += $(libbase58_CFLAGS) $(libblkmaker_CFLAGS)
+EXTRA_bfgminer_DEPENDENCIES += $(libbase58_EXTRADEPS) $(libblkmaker_EXTRADEPS)
 @BUNDLED_LIB_RULES@
 
 bfgminer_SOURCES	+= logging.c

configure.ac

@@ -1386,7 +1386,8 @@ else
 fi
 
 
-BFG_BUNDLED_LIB([libblkmaker],[libblkmaker_jansson-0.1],[no],[libblkmaker],[blkmaker_jansson-0.1 blkmaker-0.1])
+BFG_BUNDLED_LIB([libbase58],[libbase58],[auto],[libbase58],[base58],[],[--disable-tool --disable-static --enable-shared])
+BFG_BUNDLED_LIB([libblkmaker],[libblkmaker_jansson-0.1],[no],[libblkmaker],[blkmaker_jansson-0.1 blkmaker-0.1],[libbase58])
 
 
 $have_udevrules || use_udevrules=false
@@ -1834,8 +1835,8 @@ echo "------------------------------------------------------------------------"
 echo "$PACKAGE $VERSION configuration options summary"
 echo "------------------------------------------------------------------------"
 echo
-echo "  CFLAGS...............: "`wordfilter "$CPPFLAGS $AUTOSCAN_CPPFLAGS $NCURSES_CPPFLAGS $PTHREAD_FLAGS $CFLAGS $LIBUSB_CFLAGS $JANSSON_CFLAGS $PTHREAD_FLAGS $libblkmaker_CFLAGS $hidapi_CFLAGS"`
-echo "  LDFLAGS..............: "`wordfilter "$LDFLAGS $AUTOSCAN_LIBS $PTHREAD_FLAGS $PTHREAD_LIBS $LIBS $DLOPEN_FLAGS $LIBCURL_LIBS $JANSSON_LIBS $NCURSES_LIBS $PDCURSES_LIBS $WS2_LIBS $MATH_LIBS $UDEV_LIBS $LIBUSB_LIBS $RT_LIBS $sensors_LIBS $libblkmaker_LIBS"`
+echo "  CFLAGS...............: "`wordfilter "$CPPFLAGS $AUTOSCAN_CPPFLAGS $NCURSES_CPPFLAGS $PTHREAD_FLAGS $CFLAGS $LIBUSB_CFLAGS $JANSSON_CFLAGS $PTHREAD_FLAGS $libbase58_CFLAGS $libblkmaker_CFLAGS $hidapi_CFLAGS"`
+echo "  LDFLAGS..............: "`wordfilter "$LDFLAGS $AUTOSCAN_LIBS $PTHREAD_FLAGS $PTHREAD_LIBS $LIBS $DLOPEN_FLAGS $LIBCURL_LIBS $JANSSON_LIBS $NCURSES_LIBS $PDCURSES_LIBS $WS2_LIBS $MATH_LIBS $UDEV_LIBS $LIBUSB_LIBS $RT_LIBS $sensors_LIBS $libbase58_LIBS $libblkmaker_LIBS"`
 echo "  Installation.prefix..: $prefix"
 echo
 echo "${lowllist_print}" | tr '~' '\n'

libbase58

@@ -0,0 +1 @@
+Subproject commit 619e4e15e323a93b4068c42535da7be977fb3de3

libblkmaker

@@ -1 +1 @@
-Subproject commit 6cc0258704ece616f2de6e5509abfc7fba108957
+Subproject commit d46062c7e66bd57e5e2640c4289c127c150bb495

make-release

@@ -97,16 +97,19 @@ for build in "${builds[@]}"; do
 		--enable-modminer \
 		--enable-ztex \
 		--enable-scrypt \
+		--without-system-libbase58 \
 		--host="$machine"
 	make $MAKEOPTS
 	if test "x$DEBUG_RELEASE" != "x1"; then
 		"$machine"-strip \
 			libblkmaker/.libs/*.dll \
+			libbase58/.libs/*.dll \
 			*.exe
 	fi
 	cp -vr \
 		*.exe \
 		libblkmaker/.libs/*.dll \
+		libbase58/.libs/*.dll \
 		opencl \
 		example.conf \
 		windows-build.txt \

openwrt/bfgminer/Makefile

@@ -99,6 +99,7 @@ TARGET_CFLAGS += -Iuthash-1.9.8/src
 
 CONFIGURE_ARGS += --without-libudev
 CONFIGURE_ARGS += --without-sensors
+CONFIGURE_ARGS += --without-system-libbase58
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
@@ -117,6 +118,7 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME)-rpc $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libblkmaker*.so* $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libbase58*.so* $(1)/usr/lib
 endef
 
 ALL_$(PKG_NAME)_PACKAGES += $(PKG_NAME)

windows-build.txt

@@ -239,6 +239,10 @@ C:\MinGW\msys\1.0\home\USER\bfgminer\opencl
 
 	*.cl
 
+C:\MinGW\msys\1.0\home\USER\bfgminer\libbase58\.libs
+
+	libbase58-0.dll
+
 C:\MinGW\msys\1.0\home\USER\bfgminer\libblkmaker\.libs  
 
 	libblkmaker-0.1-0.dll