[Pkg-bitcoin-commits] [libblkmaker] 01/01: Imported Upstream version 0.3.2
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Wed Nov 27 06:42:38 UTC 2013
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a commit to branch upstream
in repository libblkmaker.
commit de69bce (upstream)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Wed Nov 27 06:37:48 2013
Imported Upstream version 0.3.2
---
ChangeLog | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 8 ++++++
autogen.sh | 3 ++
base58.c | 7 +++++
blkmaker.c | 7 +++++
blkmaker_jansson.c | 9 +++++-
blktemplate.c | 9 +++++-
blktemplate.h | 7 +++++
configure.ac | 7 ++++-
example.c | 7 +++++
hex.c | 7 +++++
testinput.c | 6 ++++
12 files changed, 154 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d9c562a..bc35c70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,79 @@
+2013-08-24 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Bump libtool version for 0.3.2
+
+2013-08-24 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Merge branch '0.2.x' into 0.3.x
+
+2013-08-24 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Merge branch '0.1.x' into 0.2.x
+
+2013-08-24 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Merge commit '57f81f1' into 0.1.x
+
+2013-08-24 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Bugfix: Advertise support for version/* mutations and submit/{coinbase,truncate} abbreviations
+
+2013-06-25 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Merge branch '0.2.x' into 0.3.x
+
+2013-06-25 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Null-Merge branch '0.2.x' (early part) into 0.3.x
+
+2013-06-25 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Merge branch '0.1.x' into 0.2.x
+
+2013-06-25 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Null-Merge branch '0.1.x' (early part) into 0.2.x
+
+2013-06-25 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Merge commit '17d6193' into 0.1.x
+
+2013-06-25 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Bugfix: blktmpl_add_* returns a const char * for errors, not false (for template already populated)
+
+2013-06-13 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Bump libtool version for 0.1.4
+
+2013-06-01 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Add missing copyright headers
+
+2013-06-01 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Add missing copyright headers
+
+2013-06-01 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Add missing copyright headers
+
+2013-05-01 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Merge branch '0.2.x'
+
+2013-05-01 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Merge branch '0.1.x' into 0.2.x
+
+2013-05-01 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Bugfix: Install header for libblkmaker_jansson
+
+2013-05-01 Luke Dashjr <luke-jr+git at utopios.org>
+
+ * Merge commit 'e39b2ac' into 0.1.x
+
2013-04-05 Luke Dashjr <luke-jr+git at utopios.org>
* Bump libtool version and BLKMAKER_VERSION for 0.3.0
@@ -48,6 +124,10 @@
2012-11-17 Luke Dashjr <luke-jr+git at utopios.org>
+ * Merge branch 'bugfix_limits_opt' into 0.1.x
+
+2012-11-17 Luke Dashjr <luke-jr+git at utopios.org>
+
* Bugfix: sigoplimit and sizelimit should be optional
2012-11-03 Luke Dashjr <luke-jr+git at utopios.org>
diff --git a/Makefile.am b/Makefile.am
index 6514961..b246212 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,8 @@
+# Copyright 2012-2013 Luke Dashjr
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the standard MIT license. See COPYING for more details.
+
lib_LTLIBRARIES = \
libblkmaker_jansson- at LIBBLKMAKER_API_VERSION@.la \
libblkmaker- at LIBBLKMAKER_API_VERSION@.la
@@ -26,6 +31,9 @@ libblkmaker_jansson_ at LIBBLKMAKER_API_VERSION@_la_LDFLAGS = \
-no-undefined \
-version-info $(LIBBLKMAKER_SO_VERSION)
+libblkmaker_jansson_includedir = $(includedir)/libblkmaker-$(LIBBLKMAKER_API_VERSION)
+libblkmaker_jansson_include_HEADERS = \
+ blkmaker_jansson.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
diff --git a/autogen.sh b/autogen.sh
index 7e138f8..666e0fc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,7 @@
#!/bin/sh -e
+# Written by Luke Dashjr in 2012
+# This program is released under the terms of the Creative Commons "CC0 1.0 Universal" license and/or copyright waiver.
+
if test -z "$srcdir"; then
srcdir=`dirname "$0"`
if test -z "$srcdir"; then
diff --git a/base58.c b/base58.c
index 5d4affa..6810002 100644
--- a/base58.c
+++ b/base58.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2012 Luke Dashjr
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the standard MIT license. See COPYING for more details.
+ */
+
#ifndef WIN32
#include <arpa/inet.h>
#else
diff --git a/blkmaker.c b/blkmaker.c
index 8da534a..1bb6e28 100644
--- a/blkmaker.c
+++ b/blkmaker.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2012 Luke Dashjr
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the standard MIT license. See COPYING for more details.
+ */
+
#include <limits.h>
#include <stdbool.h>
#include <stdint.h>
diff --git a/blkmaker_jansson.c b/blkmaker_jansson.c
index 26635c3..dab5f55 100644
--- a/blkmaker_jansson.c
+++ b/blkmaker_jansson.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2012-2013 Luke Dashjr
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the standard MIT license. See COPYING for more details.
+ */
+
#define _BSD_SOURCE
#include <stdlib.h>
@@ -168,7 +175,7 @@ void my_flip(void *data, size_t datasz) {
const char *blktmpl_add_jansson(blktemplate_t *tmpl, const json_t *json, time_t time_rcvd) {
if (tmpl->version)
- return false;
+ return "Template already populated (combining not supported)";
json_t *v, *v2;
const char *s;
diff --git a/blktemplate.c b/blktemplate.c
index a8670b2..ea4c87d 100644
--- a/blktemplate.c
+++ b/blktemplate.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2012 Luke Dashjr
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the standard MIT license. See COPYING for more details.
+ */
+
#define _BSD_SOURCE
#include <limits.h>
@@ -73,7 +80,7 @@ gbt_capabilities_t blktmpl_addcaps(const blktemplate_t *tmpl) {
// For now, it's a simple "filled" vs "not filled"
if (tmpl->version)
return 0;
- return GBT_CBTXN | GBT_WORKID | BMM_TIMEINC | BMM_CBAPPEND;
+ return GBT_CBTXN | GBT_WORKID | BMM_TIMEINC | BMM_CBAPPEND | BMM_VERFORCE | BMM_VERDROP | BMAb_COINBASE | BMAb_TRUNCATE;
}
const struct blktmpl_longpoll_req *blktmpl_get_longpoll(blktemplate_t *tmpl) {
diff --git a/blktemplate.h b/blktemplate.h
index b5f579b..e9747b7 100644
--- a/blktemplate.h
+++ b/blktemplate.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2012 Luke Dashjr
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the standard MIT license. See COPYING for more details.
+ */
+
#ifndef BLKTEMPLATE_H
#define BLKTEMPLATE_H
diff --git a/configure.ac b/configure.ac
index 56f3efb..8102143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,8 @@
+dnl * Copyright 2012-2013 Luke Dashjr
+dnl *
+dnl * This program is free software; you can redistribute it and/or modify it
+dnl * under the terms of the standard MIT license. See COPYING for more details.
+
AC_INIT(
[libblkmaker],
[0.1],
@@ -13,7 +18,7 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
LT_INIT([disable-static])
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([LIBBLKMAKER_SO_VERSION], [4:0:4])
+AC_SUBST([LIBBLKMAKER_SO_VERSION], [4:1:4])
AC_SUBST([LIBBLKMAKER_API_VERSION], [0.1])
AC_CONFIG_FILES([Makefile
diff --git a/example.c b/example.c
index 5382b91..7f8c1e2 100644
--- a/example.c
+++ b/example.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2012 Luke Dashjr
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the standard MIT license. See COPYING for more details.
+ */
+
#include <assert.h>
#include <inttypes.h>
#include <stdint.h>
diff --git a/hex.c b/hex.c
index 0607bfe..8fe1314 100644
--- a/hex.c
+++ b/hex.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2012 Luke Dashjr
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the standard MIT license. See COPYING for more details.
+ */
+
#include <string.h>
#include <stdbool.h>
diff --git a/testinput.c b/testinput.c
index 4b9c8f2..31d2a75 100644
--- a/testinput.c
+++ b/testinput.c
@@ -1,3 +1,9 @@
+/*
+ * Written by Luke Dashjr in 2012
+ *
+ * This data is released under the terms of the Creative Commons "CC0 1.0 Universal" license and/or copyright waiver.
+ */
+
const char *blkmaker_test_input =
"{"
"\"result\": {"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libblkmaker.git
More information about the Pkg-bitcoin-commits
mailing list