From 2efa11e99bec25a3a64c8fae20d7641345c8df9f Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 4 Apr 2010 22:09:19 +0000
Subject: pybld

---
 configure.ac                           | 12 ++++++++++++
 doc/man/gnunet-pseudonym.1             |  8 ++++----
 src/include/gnunet_datastore_service.h | 14 ++++++++------
 src/include/gnunet_fs_service.h        |  2 +-
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index aad6e44a4..8a53dd064 100644
--- a/configure.ac
+++ b/configure.ac
@@ -484,6 +484,18 @@ AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+# check for python & pexpect (used for some testcases only)
+AC_MSG_CHECKING([for python and pexpect])
+python -c "import pexpect" &> /dev/null
+PYEX=$?
+AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0)
+if test $PYEX -eq 0
+then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([not found])
+fi
+
 # libesmtp
 esmtp=0
 AC_MSG_CHECKING([for libesmtp])
diff --git a/doc/man/gnunet-pseudonym.1 b/doc/man/gnunet-pseudonym.1
index f07359bdb..eed1cab62 100644
--- a/doc/man/gnunet-pseudonym.1
+++ b/doc/man/gnunet-pseudonym.1
@@ -48,14 +48,14 @@ Print help page.
 \fB\-k KEYWORD\fR, \fB\-\-keyword=KEYWORD\fR
 Publish a namespace advertisement under the keyword 'KEYWORD'.  Default is 'namespace' (use with \-C).  You can specify \-k multiple times.  In that case, the namespace will be published under each of those keywords.
 
-.TP
-\fB\-l\fR, \fB\-\-local\-only\fR
-display names of local namespaces (those that we can extend with content because we created them)
-
 .TP
 \fB\-m \fITYPE:VALUE\fR, \fB\-\-meta=\fITYPE:VALUE\fR
 For the main file (or directory), set the metadata of the given TYPE to the given VALUE.  Note that this will not add the respective VALUE to the set of keywords under which the file can be found.
 
+.TP
+\fB\-o\fR, \fB\-\-only\-local\fR
+display names of local namespaces (those that we can extend with content because we created them)
+
 .TP
 \fB\-p \fIPRIORITY\fR, \fB\-\-prio=\fIPRIORITY\fR
 Set the priority of the namespace advertisement (default: 365).  If the local database is full, GNUnet will discard the content with the lowest ranking.  Note that ranks change over time depending on popularity.  The default should be high enough to preserve the locally inserted content in favor of content that migrates from other peers.
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index a506362f2..2bf0f8f34 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -42,32 +42,34 @@ extern "C"
 #endif
 
 /**
- * FIXME.
+ * Any type of block, used as a wildcard when searching.  Should
+ * never be attached to a specific block.
  */
 #define GNUNET_DATASTORE_BLOCKTYPE_ANY 0
 
 /**
- * FIXME.
+ * Data block (leaf) in the CHK tree.
  */
 #define GNUNET_DATASTORE_BLOCKTYPE_DBLOCK 1
 
 /**
- * FIXME.
+ * Inner block in the CHK tree.
  */
 #define GNUNET_DATASTORE_BLOCKTYPE_IBLOCK 2
 
 /**
- * FIXME.
+ * Type of a block representing a keyword search result.
  */
 #define GNUNET_DATASTORE_BLOCKTYPE_KBLOCK 3
 
 /**
- * FIXME.
+ * Type of a block that is used to advertise content in a namespace.
  */
 #define GNUNET_DATASTORE_BLOCKTYPE_SBLOCK 4
 
 /**
- * FIXME.
+ * Type of a block representing a block to be encoded on demand from disk.
+ * Should never appear on the network directly.
  */
 #define GNUNET_DATASTORE_BLOCKTYPE_ONDEMAND 5
 
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index 6da6ce43e..e26d6b000 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -1984,7 +1984,7 @@ GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h,
 		       struct GNUNET_FS_Namespace *namespace,
 		       const char *identifier,
 		       const char *update,
-		       struct GNUNET_CONTAINER_MetaData *meta,
+		       const struct GNUNET_CONTAINER_MetaData *meta,
 		       const struct GNUNET_FS_Uri *uri,
 		       struct GNUNET_TIME_Absolute expirationTime,
 		       uint32_t anonymity,
-- 
cgit v1.2.3